Class SvnNgMergeCallback
- java.lang.Object
-
- org.tmatesoft.svn.core.internal.wc2.ng.SvnNgMergeCallback
-
- All Implemented Interfaces:
ISvnDiffCallback
public class SvnNgMergeCallback extends java.lang.Object implements ISvnDiffCallback
-
-
Field Summary
Fields Modifier and Type Field Description private java.util.Collection<java.io.File>
conflictedPaths
private SvnNgMergeDriver
driver
-
Constructor Summary
Constructors Constructor Description SvnNgMergeCallback(SvnNgMergeDriver driver)
-
Method Summary
All Methods Static Methods Instance Methods Concrete Methods Modifier and Type Method Description private void
addPathWithAddedMergeInfo(java.io.File localAbsPath)
private void
addPathWithDeletedMergeInfo(java.io.File localAbsPath)
private boolean
areSourcesAncestral()
private void
checkReposMatch(java.io.File path, SVNURL url)
private boolean
compareFiles(java.io.File oldPath, SVNProperties oldProps, java.io.File minePath)
private boolean
compareProps(SVNProperties p1, SVNProperties p2)
void
dirAdded(SvnDiffCallbackResult result, java.io.File path, long revision, java.lang.String copyFromPath, long copyFromRevision)
void
dirClosed(SvnDiffCallbackResult result, java.io.File path, boolean isAdded)
void
dirDeleted(SvnDiffCallbackResult result, java.io.File path)
void
dirOpened(SvnDiffCallbackResult result, java.io.File path, long revision)
void
dirPropsChanged(SvnDiffCallbackResult result, java.io.File path, boolean isAdded, SVNProperties propChanges, SVNProperties originalProperties)
void
fileAdded(SvnDiffCallbackResult result, java.io.File path, java.io.File leftFile, java.io.File rightFile, long rev1, long rev2, java.lang.String mimeType1, java.lang.String mimeType2, java.io.File copyFromPath, long copyFromRevision, SVNProperties propChanges, SVNProperties originalProperties)
void
fileChanged(SvnDiffCallbackResult result, java.io.File path, java.io.File tmpFile1, java.io.File tmpFile2, long rev1, long rev2, java.lang.String mimetype1, java.lang.String mimeType2, SVNProperties propChanges, SVNProperties originalProperties)
void
fileDeleted(SvnDiffCallbackResult result, java.io.File path, java.io.File leftFile, java.io.File rightFile, java.lang.String mimeType1, java.lang.String mimeType2, SVNProperties originalProperties)
void
fileOpened(SvnDiffCallbackResult result, java.io.File path, long revision)
private SVNProperties
filterSelfReferentialMergeInfo(SVNProperties props, java.io.File localAbsPath, boolean honorMergeInfo, boolean sameRepos, boolean reintegrateMerge, SVNRepository repos)
private java.io.File
getAddedPath()
java.util.Collection<java.io.File>
getConflictedPaths()
private SVNWCContext
getContext()
private SVNDiffOptions
getDiffOptions()
private java.util.Collection<java.io.File>
getDryRunAdditions()
private java.util.Collection<java.io.File>
getDryRunDeletions()
private SVNRepository
getRepos1()
private SVNRepository
getRepos2()
private SvnRepositoryAccess
getRepositoryAccess()
private SVNURL
getReposRootURL()
private long
getSource1Rev()
private SVNURL
getSource1URL()
private long
getSource2Rev()
private SVNURL
getSource2URL()
private java.io.File
getTargetPath()
private boolean
isDryRun()
private boolean
isForce()
private boolean
isHonorMergeInfo()
private boolean
isRecordOnly()
private boolean
isReintegrateMerge()
private boolean
isSameRepos()
private SVNConflictVersion[]
makeConflictVersions(java.io.File target, SVNNodeKind kind)
private SVNTreeConflictDescription
makeTreeConflict(java.io.File path, SVNNodeKind kind, SVNConflictAction action, SVNConflictReason reason)
private SVNWCContext.MergePropertiesInfo
mergePropChanges(java.io.File localAbsPath, SVNProperties propChanges, SVNProperties originalProperties)
protected static SVNProperties
omitMergeInfoChanges(SVNProperties props)
private void
setAddedPath(java.io.File path)
private void
setDryRunAddtions(java.util.Collection<java.io.File> set)
private void
setDryRunDeletions(java.util.Collection<java.io.File> set)
private java.util.Map<java.lang.String,SVNMergeRangeList>[]
splitMergeInfoOnRevision(java.util.Map<java.lang.String,SVNMergeRangeList> mergeinfo, long revision)
private void
treeConflict(java.io.File path, SVNNodeKind kind, SVNConflictAction action, SVNConflictReason reason)
private void
treeConflictOnAdd(java.io.File path, SVNNodeKind kind, SVNConflictAction action, SVNConflictReason reason)
-
-
-
Field Detail
-
conflictedPaths
private java.util.Collection<java.io.File> conflictedPaths
-
driver
private SvnNgMergeDriver driver
-
-
Constructor Detail
-
SvnNgMergeCallback
public SvnNgMergeCallback(SvnNgMergeDriver driver)
-
-
Method Detail
-
getConflictedPaths
public java.util.Collection<java.io.File> getConflictedPaths()
-
fileOpened
public void fileOpened(SvnDiffCallbackResult result, java.io.File path, long revision) throws SVNException
- Specified by:
fileOpened
in interfaceISvnDiffCallback
- Throws:
SVNException
-
fileChanged
public void fileChanged(SvnDiffCallbackResult result, java.io.File path, java.io.File tmpFile1, java.io.File tmpFile2, long rev1, long rev2, java.lang.String mimetype1, java.lang.String mimeType2, SVNProperties propChanges, SVNProperties originalProperties) throws SVNException
- Specified by:
fileChanged
in interfaceISvnDiffCallback
- Throws:
SVNException
-
fileAdded
public void fileAdded(SvnDiffCallbackResult result, java.io.File path, java.io.File leftFile, java.io.File rightFile, long rev1, long rev2, java.lang.String mimeType1, java.lang.String mimeType2, java.io.File copyFromPath, long copyFromRevision, SVNProperties propChanges, SVNProperties originalProperties) throws SVNException
- Specified by:
fileAdded
in interfaceISvnDiffCallback
- Throws:
SVNException
-
fileDeleted
public void fileDeleted(SvnDiffCallbackResult result, java.io.File path, java.io.File leftFile, java.io.File rightFile, java.lang.String mimeType1, java.lang.String mimeType2, SVNProperties originalProperties) throws SVNException
- Specified by:
fileDeleted
in interfaceISvnDiffCallback
- Throws:
SVNException
-
setDryRunDeletions
private void setDryRunDeletions(java.util.Collection<java.io.File> set)
-
setDryRunAddtions
private void setDryRunAddtions(java.util.Collection<java.io.File> set)
-
dirDeleted
public void dirDeleted(SvnDiffCallbackResult result, java.io.File path) throws SVNException
- Specified by:
dirDeleted
in interfaceISvnDiffCallback
- Throws:
SVNException
-
dirOpened
public void dirOpened(SvnDiffCallbackResult result, java.io.File path, long revision) throws SVNException
- Specified by:
dirOpened
in interfaceISvnDiffCallback
- Throws:
SVNException
-
dirAdded
public void dirAdded(SvnDiffCallbackResult result, java.io.File path, long revision, java.lang.String copyFromPath, long copyFromRevision) throws SVNException
- Specified by:
dirAdded
in interfaceISvnDiffCallback
- Throws:
SVNException
-
dirPropsChanged
public void dirPropsChanged(SvnDiffCallbackResult result, java.io.File path, boolean isAdded, SVNProperties propChanges, SVNProperties originalProperties) throws SVNException
- Specified by:
dirPropsChanged
in interfaceISvnDiffCallback
- Throws:
SVNException
-
dirClosed
public void dirClosed(SvnDiffCallbackResult result, java.io.File path, boolean isAdded) throws SVNException
- Specified by:
dirClosed
in interfaceISvnDiffCallback
- Throws:
SVNException
-
checkReposMatch
private void checkReposMatch(java.io.File path, SVNURL url) throws SVNException
- Throws:
SVNException
-
mergePropChanges
private SVNWCContext.MergePropertiesInfo mergePropChanges(java.io.File localAbsPath, SVNProperties propChanges, SVNProperties originalProperties) throws SVNException
- Throws:
SVNException
-
addPathWithAddedMergeInfo
private void addPathWithAddedMergeInfo(java.io.File localAbsPath)
-
addPathWithDeletedMergeInfo
private void addPathWithDeletedMergeInfo(java.io.File localAbsPath)
-
filterSelfReferentialMergeInfo
private SVNProperties filterSelfReferentialMergeInfo(SVNProperties props, java.io.File localAbsPath, boolean honorMergeInfo, boolean sameRepos, boolean reintegrateMerge, SVNRepository repos) throws SVNException
- Throws:
SVNException
-
splitMergeInfoOnRevision
private java.util.Map<java.lang.String,SVNMergeRangeList>[] splitMergeInfoOnRevision(java.util.Map<java.lang.String,SVNMergeRangeList> mergeinfo, long revision)
-
omitMergeInfoChanges
protected static SVNProperties omitMergeInfoChanges(SVNProperties props)
-
isHonorMergeInfo
private boolean isHonorMergeInfo()
-
makeConflictVersions
private SVNConflictVersion[] makeConflictVersions(java.io.File target, SVNNodeKind kind) throws SVNException
- Throws:
SVNException
-
treeConflictOnAdd
private void treeConflictOnAdd(java.io.File path, SVNNodeKind kind, SVNConflictAction action, SVNConflictReason reason) throws SVNException
- Throws:
SVNException
-
makeTreeConflict
private SVNTreeConflictDescription makeTreeConflict(java.io.File path, SVNNodeKind kind, SVNConflictAction action, SVNConflictReason reason) throws SVNException
- Throws:
SVNException
-
treeConflict
private void treeConflict(java.io.File path, SVNNodeKind kind, SVNConflictAction action, SVNConflictReason reason) throws SVNException
- Throws:
SVNException
-
compareProps
private boolean compareProps(SVNProperties p1, SVNProperties p2) throws SVNException
- Throws:
SVNException
-
compareFiles
private boolean compareFiles(java.io.File oldPath, SVNProperties oldProps, java.io.File minePath) throws SVNException
- Throws:
SVNException
-
getContext
private SVNWCContext getContext()
-
isReintegrateMerge
private boolean isReintegrateMerge()
-
isRecordOnly
private boolean isRecordOnly()
-
isDryRun
private boolean isDryRun()
-
isForce
private boolean isForce()
-
isSameRepos
private boolean isSameRepos()
-
getDiffOptions
private SVNDiffOptions getDiffOptions()
-
getAddedPath
private java.io.File getAddedPath()
-
setAddedPath
private void setAddedPath(java.io.File path)
-
areSourcesAncestral
private boolean areSourcesAncestral()
-
getTargetPath
private java.io.File getTargetPath()
-
getRepos1
private SVNRepository getRepos1()
-
getRepos2
private SVNRepository getRepos2()
-
getReposRootURL
private SVNURL getReposRootURL()
-
getRepositoryAccess
private SvnRepositoryAccess getRepositoryAccess()
-
getSource1URL
private SVNURL getSource1URL()
-
getSource2URL
private SVNURL getSource2URL()
-
getSource1Rev
private long getSource1Rev()
-
getSource2Rev
private long getSource2Rev()
-
getDryRunDeletions
private java.util.Collection<java.io.File> getDryRunDeletions()
-
getDryRunAdditions
private java.util.Collection<java.io.File> getDryRunAdditions()
-
-