public class SvnNgMergeCallback extends java.lang.Object implements ISvnDiffCallback
Modifier and Type | Field and Description |
---|---|
private java.util.Collection<java.io.File> |
conflictedPaths |
private SvnNgMergeDriver |
driver |
Constructor and Description |
---|
SvnNgMergeCallback(SvnNgMergeDriver driver) |
Modifier and Type | Method and 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) |
private java.util.Collection<java.io.File> conflictedPaths
private SvnNgMergeDriver driver
public SvnNgMergeCallback(SvnNgMergeDriver driver)
public java.util.Collection<java.io.File> getConflictedPaths()
public void fileOpened(SvnDiffCallbackResult result, java.io.File path, long revision) throws SVNException
fileOpened
in interface ISvnDiffCallback
SVNException
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
fileChanged
in interface ISvnDiffCallback
SVNException
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
fileAdded
in interface ISvnDiffCallback
SVNException
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
fileDeleted
in interface ISvnDiffCallback
SVNException
private void setDryRunDeletions(java.util.Collection<java.io.File> set)
private void setDryRunAddtions(java.util.Collection<java.io.File> set)
public void dirDeleted(SvnDiffCallbackResult result, java.io.File path) throws SVNException
dirDeleted
in interface ISvnDiffCallback
SVNException
public void dirOpened(SvnDiffCallbackResult result, java.io.File path, long revision) throws SVNException
dirOpened
in interface ISvnDiffCallback
SVNException
public void dirAdded(SvnDiffCallbackResult result, java.io.File path, long revision, java.lang.String copyFromPath, long copyFromRevision) throws SVNException
dirAdded
in interface ISvnDiffCallback
SVNException
public void dirPropsChanged(SvnDiffCallbackResult result, java.io.File path, boolean isAdded, SVNProperties propChanges, SVNProperties originalProperties) throws SVNException
dirPropsChanged
in interface ISvnDiffCallback
SVNException
public void dirClosed(SvnDiffCallbackResult result, java.io.File path, boolean isAdded) throws SVNException
dirClosed
in interface ISvnDiffCallback
SVNException
private void checkReposMatch(java.io.File path, SVNURL url) throws SVNException
SVNException
private SVNWCContext.MergePropertiesInfo mergePropChanges(java.io.File localAbsPath, SVNProperties propChanges, SVNProperties originalProperties) throws SVNException
SVNException
private void addPathWithAddedMergeInfo(java.io.File localAbsPath)
private void addPathWithDeletedMergeInfo(java.io.File localAbsPath)
private SVNProperties filterSelfReferentialMergeInfo(SVNProperties props, java.io.File localAbsPath, boolean honorMergeInfo, boolean sameRepos, boolean reintegrateMerge, SVNRepository repos) throws SVNException
SVNException
private java.util.Map<java.lang.String,SVNMergeRangeList>[] splitMergeInfoOnRevision(java.util.Map<java.lang.String,SVNMergeRangeList> mergeinfo, long revision)
protected static SVNProperties omitMergeInfoChanges(SVNProperties props)
private boolean isHonorMergeInfo()
private SVNConflictVersion[] makeConflictVersions(java.io.File target, SVNNodeKind kind) throws SVNException
SVNException
private void treeConflictOnAdd(java.io.File path, SVNNodeKind kind, SVNConflictAction action, SVNConflictReason reason) throws SVNException
SVNException
private SVNTreeConflictDescription makeTreeConflict(java.io.File path, SVNNodeKind kind, SVNConflictAction action, SVNConflictReason reason) throws SVNException
SVNException
private void treeConflict(java.io.File path, SVNNodeKind kind, SVNConflictAction action, SVNConflictReason reason) throws SVNException
SVNException
private boolean compareProps(SVNProperties p1, SVNProperties p2) throws SVNException
SVNException
private boolean compareFiles(java.io.File oldPath, SVNProperties oldProps, java.io.File minePath) throws SVNException
SVNException
private SVNWCContext getContext()
private boolean isReintegrateMerge()
private boolean isRecordOnly()
private boolean isDryRun()
private boolean isForce()
private boolean isSameRepos()
private SVNDiffOptions getDiffOptions()
private java.io.File getAddedPath()
private void setAddedPath(java.io.File path)
private boolean areSourcesAncestral()
private java.io.File getTargetPath()
private SVNRepository getRepos1()
private SVNRepository getRepos2()
private SVNURL getReposRootURL()
private SvnRepositoryAccess getRepositoryAccess()
private SVNURL getSource1URL()
private SVNURL getSource2URL()
private long getSource1Rev()
private long getSource2Rev()
private java.util.Collection<java.io.File> getDryRunDeletions()
private java.util.Collection<java.io.File> getDryRunAdditions()