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
-
-
Constructor Summary
Constructors Constructor Description SvnNgMergeCallback(SvnNgMergeDriver driver)
-
Method Summary
All Methods Static Methods Instance Methods Concrete Methods Modifier and Type Method Description 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)
java.util.Collection<java.io.File>
getConflictedPaths()
protected static SVNProperties
omitMergeInfoChanges(SVNProperties props)
-
-
-
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
-
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
-
omitMergeInfoChanges
protected static SVNProperties omitMergeInfoChanges(SVNProperties props)
-
-