public class SvnNgMergeCallback2 extends java.lang.Object implements ISvnDiffCallback2
Modifier and Type | Class and Description |
---|---|
private class |
SvnNgMergeCallback2.DirectoryBaton |
private static class |
SvnNgMergeCallback2.DirectoryDeleteBaton |
private class |
SvnNgMergeCallback2.FileBaton |
private static class |
SvnNgMergeCallback2.MergeOutcome |
private static class |
SvnNgMergeCallback2.SplitMergeInfo |
private static class |
SvnNgMergeCallback2.VerifyTouchedByDelCheck |
Modifier and Type | Field and Description |
---|---|
private SVNWCContext |
context |
private SvnNgMergeCallback2.FileBaton |
currentFile |
private SvnNgMergeDriver |
mergeDriver |
private SvnNgRepositoryAccess |
repositoryAccess |
Constructor and Description |
---|
SvnNgMergeCallback2(SVNWCContext context,
SvnNgMergeDriver mergeDriver,
SvnNgRepositoryAccess repositoryAccess) |
Modifier and Type | Method and Description |
---|---|
private boolean |
areFilesSame(java.io.File olderAbsPath,
SVNProperties originalProps,
java.io.File mineAbsPath) |
private boolean |
arePropertiesSame(SVNProperties originalProps,
SVNProperties workingProps) |
private void |
checkReposMatch(SVNURL reposRootUrl,
java.io.File localAbsPath,
SVNURL url) |
private void |
completeDirectoryAdd(java.io.File localAbsPath,
SVNProperties newOriginalProps,
SVNURL copyFromUrl,
long copyFromRevision) |
void |
dirAdded(SvnDiffCallbackResult result,
java.io.File relPath,
SvnDiffSource copyFromSource,
SvnDiffSource rightSource,
SVNProperties copyFromProps,
SVNProperties rightProps,
java.lang.Object dirBaton) |
void |
dirChanged(SvnDiffCallbackResult result,
java.io.File relPath,
SvnDiffSource leftSource,
SvnDiffSource rightSource,
SVNProperties leftProps,
SVNProperties rightProps,
SVNProperties propChanges,
java.lang.Object dirBaton) |
void |
dirClosed(SvnDiffCallbackResult result,
java.io.File relPath,
SvnDiffSource leftSource,
SvnDiffSource rightSource,
java.lang.Object dirBaton) |
void |
dirDeleted(SvnDiffCallbackResult result,
java.io.File relPath,
SvnDiffSource leftSource,
SVNProperties leftProps,
java.lang.Object dirBaton) |
void |
dirOpened(SvnDiffCallbackResult result,
java.io.File relPath,
SvnDiffSource leftSource,
SvnDiffSource rightSource,
SvnDiffSource copyFromSource,
java.lang.Object dirBaton) |
void |
dirPropsChanged(SvnDiffCallbackResult result,
java.io.File relPath,
SvnDiffSource leftSource,
SvnDiffSource rightSource,
SVNProperties leftProps,
SVNProperties rightProps,
SVNProperties propChanges) |
void |
fileAdded(SvnDiffCallbackResult result,
java.io.File relPath,
SvnDiffSource copyFromSource,
SvnDiffSource rightSource,
java.io.File copyFromFile,
java.io.File rightFile,
SVNProperties copyFromProps,
SVNProperties rightProps) |
void |
fileChanged(SvnDiffCallbackResult result,
java.io.File relPath,
SvnDiffSource leftSource,
SvnDiffSource rightSource,
java.io.File leftFile,
java.io.File rightFile,
SVNProperties leftProps,
SVNProperties rightProps,
boolean fileModified,
SVNProperties propChanges) |
void |
fileClosed(SvnDiffCallbackResult result,
java.io.File relPath,
SvnDiffSource leftSource,
SvnDiffSource rightSource) |
void |
fileDeleted(SvnDiffCallbackResult result,
java.io.File relPath,
SvnDiffSource leftSource,
java.io.File leftFile,
SVNProperties leftProps) |
void |
fileOpened(SvnDiffCallbackResult result,
java.io.File relPath,
SvnDiffSource leftSource,
SvnDiffSource rightSource,
SvnDiffSource copyFromSource,
boolean createDirBaton,
java.lang.Object dirBaton) |
private SVNProperties |
filterSelfReferentialMergeInfo(SVNProperties props,
java.io.File targetAbsPath,
SVNRepository svnRepository) |
private void |
handlePendingNotifications(SvnNgMergeCallback2.DirectoryBaton db) |
private SVNConflictVersion[] |
makeConflictVersions(java.io.File victimAbsPath,
SVNNodeKind nodeKind,
SVNURL rootUrl,
SvnNgMergeDriver.MergeSource mergeSource,
java.io.File targetAbsPath) |
private SvnNgMergeCallback2.MergeOutcome |
merge(java.io.File leftAbsPath,
java.io.File rightAbsPath,
java.io.File targetAbsPath,
java.lang.String leftLabel,
java.lang.String rightLabel,
java.lang.String targetLabel,
SVNConflictVersion leftVersion,
SVNConflictVersion rightVersion,
boolean dryRun,
java.lang.String diff3Cmd,
SVNDiffOptions mergeOptions,
SVNProperties originalProps,
SVNProperties propChanges,
boolean mergeContentNeeded,
boolean mergePropsNeeded,
ISVNConflictHandler conflictResolver) |
void |
nodeAbsent(SvnDiffCallbackResult result,
java.io.File relPath,
java.lang.Object dirBaton) |
private void |
notifyMergeBegin(java.io.File localAbsPath,
boolean deleteAction) |
private SVNWCContext.ObstructionData |
performObstructionCheck(java.io.File localAbsPath) |
private SVNProperties |
prepareMergePropsChanged(java.io.File localAbsPath,
SVNProperties propChanges) |
private void |
recordSkip(java.io.File localAbsPath,
SVNNodeKind kind,
SVNEventAction action,
SVNStatusType state) |
private void |
recordTreeConflict(java.io.File localAbsPath,
SvnNgMergeCallback2.DirectoryBaton parentBaton,
SVNNodeKind nodeKind,
SVNConflictAction action,
SVNConflictReason reason,
SVNWCConflictDescription17 existingConflict,
boolean notifyTreeConflict) |
private void |
recordUpdateAdd(java.io.File localAbsPath,
SVNNodeKind kind,
boolean notifyReplaced) |
private void |
recordUpdateDelete(java.io.File localAbsPath,
SVNNodeKind kind,
SvnNgMergeCallback2.DirectoryBaton parentBaton) |
private void |
recordUpdateUpdate(java.io.File localAbsPath,
SVNNodeKind kind,
SVNStatusType contentState,
SVNStatusType propState) |
private void |
removeSourceGap(SVNMergeRange range,
SVNMergeRangeList implicitSrcGap) |
private SVNURL |
reposLocations(SVNURL url,
long pegRevision,
SVNURL reposRootUrl,
java.lang.String reposUuid,
long opRevision,
SVNRepository svnRepository) |
private SvnNgMergeCallback2.SplitMergeInfo |
splitMergeInfoOnRevision(java.util.Map<java.lang.String,SVNMergeRangeList> mergeInfo,
long revision) |
private final SvnNgMergeDriver mergeDriver
private SvnNgMergeCallback2.FileBaton currentFile
private SVNWCContext context
private SvnNgRepositoryAccess repositoryAccess
public SvnNgMergeCallback2(SVNWCContext context, SvnNgMergeDriver mergeDriver, SvnNgRepositoryAccess repositoryAccess)
public void fileOpened(SvnDiffCallbackResult result, java.io.File relPath, SvnDiffSource leftSource, SvnDiffSource rightSource, SvnDiffSource copyFromSource, boolean createDirBaton, java.lang.Object dirBaton) throws SVNException
fileOpened
in interface ISvnDiffCallback2
SVNException
public void fileChanged(SvnDiffCallbackResult result, java.io.File relPath, SvnDiffSource leftSource, SvnDiffSource rightSource, java.io.File leftFile, java.io.File rightFile, SVNProperties leftProps, SVNProperties rightProps, boolean fileModified, SVNProperties propChanges) throws SVNException
fileChanged
in interface ISvnDiffCallback2
SVNException
public void fileAdded(SvnDiffCallbackResult result, java.io.File relPath, SvnDiffSource copyFromSource, SvnDiffSource rightSource, java.io.File copyFromFile, java.io.File rightFile, SVNProperties copyFromProps, SVNProperties rightProps) throws SVNException
fileAdded
in interface ISvnDiffCallback2
SVNException
public void fileDeleted(SvnDiffCallbackResult result, java.io.File relPath, SvnDiffSource leftSource, java.io.File leftFile, SVNProperties leftProps) throws SVNException
fileDeleted
in interface ISvnDiffCallback2
SVNException
public void fileClosed(SvnDiffCallbackResult result, java.io.File relPath, SvnDiffSource leftSource, SvnDiffSource rightSource) throws SVNException
fileClosed
in interface ISvnDiffCallback2
SVNException
public void dirOpened(SvnDiffCallbackResult result, java.io.File relPath, SvnDiffSource leftSource, SvnDiffSource rightSource, SvnDiffSource copyFromSource, java.lang.Object dirBaton) throws SVNException
dirOpened
in interface ISvnDiffCallback2
SVNException
public void dirChanged(SvnDiffCallbackResult result, java.io.File relPath, SvnDiffSource leftSource, SvnDiffSource rightSource, SVNProperties leftProps, SVNProperties rightProps, SVNProperties propChanges, java.lang.Object dirBaton) throws SVNException
dirChanged
in interface ISvnDiffCallback2
SVNException
public void dirDeleted(SvnDiffCallbackResult result, java.io.File relPath, SvnDiffSource leftSource, SVNProperties leftProps, java.lang.Object dirBaton) throws SVNException
dirDeleted
in interface ISvnDiffCallback2
SVNException
public void dirAdded(SvnDiffCallbackResult result, java.io.File relPath, SvnDiffSource copyFromSource, SvnDiffSource rightSource, SVNProperties copyFromProps, SVNProperties rightProps, java.lang.Object dirBaton) throws SVNException
dirAdded
in interface ISvnDiffCallback2
SVNException
public void dirPropsChanged(SvnDiffCallbackResult result, java.io.File relPath, SvnDiffSource leftSource, SvnDiffSource rightSource, SVNProperties leftProps, SVNProperties rightProps, SVNProperties propChanges) throws SVNException
SVNException
public void dirClosed(SvnDiffCallbackResult result, java.io.File relPath, SvnDiffSource leftSource, SvnDiffSource rightSource, java.lang.Object dirBaton) throws SVNException
dirClosed
in interface ISvnDiffCallback2
SVNException
public void nodeAbsent(SvnDiffCallbackResult result, java.io.File relPath, java.lang.Object dirBaton) throws SVNException
nodeAbsent
in interface ISvnDiffCallback2
SVNException
private void handlePendingNotifications(SvnNgMergeCallback2.DirectoryBaton db) throws SVNException
SVNException
private SvnNgMergeCallback2.MergeOutcome merge(java.io.File leftAbsPath, java.io.File rightAbsPath, java.io.File targetAbsPath, java.lang.String leftLabel, java.lang.String rightLabel, java.lang.String targetLabel, SVNConflictVersion leftVersion, SVNConflictVersion rightVersion, boolean dryRun, java.lang.String diff3Cmd, SVNDiffOptions mergeOptions, SVNProperties originalProps, SVNProperties propChanges, boolean mergeContentNeeded, boolean mergePropsNeeded, ISVNConflictHandler conflictResolver) throws SVNException
SVNException
private void recordUpdateUpdate(java.io.File localAbsPath, SVNNodeKind kind, SVNStatusType contentState, SVNStatusType propState) throws SVNException
SVNException
private void recordUpdateAdd(java.io.File localAbsPath, SVNNodeKind kind, boolean notifyReplaced) throws SVNException
SVNException
private void recordUpdateDelete(java.io.File localAbsPath, SVNNodeKind kind, SvnNgMergeCallback2.DirectoryBaton parentBaton) throws SVNException
SVNException
private void notifyMergeBegin(java.io.File localAbsPath, boolean deleteAction) throws SVNException
SVNException
private void checkReposMatch(SVNURL reposRootUrl, java.io.File localAbsPath, SVNURL url) throws SVNException
SVNException
private void removeSourceGap(SVNMergeRange range, SVNMergeRangeList implicitSrcGap)
private SVNProperties prepareMergePropsChanged(java.io.File localAbsPath, SVNProperties propChanges) throws SVNException
SVNException
private SVNConflictVersion[] makeConflictVersions(java.io.File victimAbsPath, SVNNodeKind nodeKind, SVNURL rootUrl, SvnNgMergeDriver.MergeSource mergeSource, java.io.File targetAbsPath)
private void recordSkip(java.io.File localAbsPath, SVNNodeKind kind, SVNEventAction action, SVNStatusType state) throws SVNException
SVNException
private SVNWCContext.ObstructionData performObstructionCheck(java.io.File localAbsPath) throws SVNException
SVNException
private void recordTreeConflict(java.io.File localAbsPath, SvnNgMergeCallback2.DirectoryBaton parentBaton, SVNNodeKind nodeKind, SVNConflictAction action, SVNConflictReason reason, SVNWCConflictDescription17 existingConflict, boolean notifyTreeConflict) throws SVNException
SVNException
private SVNProperties filterSelfReferentialMergeInfo(SVNProperties props, java.io.File targetAbsPath, SVNRepository svnRepository) throws SVNException
SVNException
private SVNURL reposLocations(SVNURL url, long pegRevision, SVNURL reposRootUrl, java.lang.String reposUuid, long opRevision, SVNRepository svnRepository) throws SVNException
SVNException
private SvnNgMergeCallback2.SplitMergeInfo splitMergeInfoOnRevision(java.util.Map<java.lang.String,SVNMergeRangeList> mergeInfo, long revision)
private boolean areFilesSame(java.io.File olderAbsPath, SVNProperties originalProps, java.io.File mineAbsPath) throws SVNException
SVNException
private boolean arePropertiesSame(SVNProperties originalProps, SVNProperties workingProps)
private void completeDirectoryAdd(java.io.File localAbsPath, SVNProperties newOriginalProps, SVNURL copyFromUrl, long copyFromRevision) throws SVNException
SVNException