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