public class SvnNgMergeCallback extends java.lang.Object implements ISvnDiffCallback
Constructor and Description |
---|
SvnNgMergeCallback(SvnNgMergeDriver driver) |
Modifier and Type | Method and 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) |
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
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
protected static SVNProperties omitMergeInfoChanges(SVNProperties props)
Copyright © 2004-2012 TMate Software Ltd. All Rights Reserved.