public class SVNMergeCallback extends AbstractDiffCallback
Modifier and Type | Field and Description |
---|---|
protected java.lang.String |
myAddedPath |
protected java.util.Map |
myConflictedPaths |
protected SVNDiffOptions |
myDiffOptions |
protected boolean |
myIsAddNecessitatedMerge |
protected boolean |
myIsDryRun |
protected boolean |
myIsForce |
protected SVNMergeDriver |
myMergeDriver |
protected SVNURL |
myURL |
Constructor and Description |
---|
SVNMergeCallback(SVNAdminArea adminArea,
SVNURL url,
boolean force,
boolean dryRun,
SVNDiffOptions options,
java.util.Map conflictedPathsGetter,
SVNMergeDriver mergeDriver) |
Modifier and Type | Method and Description |
---|---|
protected boolean |
areFilesTheSame(java.io.File older,
SVNProperties originalProps,
java.io.File mine,
SVNAdminArea adminArea) |
java.io.File |
createTempDirectory() |
protected void |
delete(java.io.File path,
boolean force,
boolean dryRun,
boolean keepLocal) |
SVNStatusType |
directoryAdded(java.lang.String path,
long revision,
boolean[] isTreeConflicted) |
SVNStatusType[] |
directoryClosed(java.lang.String path,
boolean[] isTreeConflicted) |
SVNStatusType |
directoryDeleted(java.lang.String path,
boolean[] isTreeConflicted) |
void |
directoryOpened(java.lang.String path,
long revision,
boolean[] isTreeConflicted) |
SVNStatusType[] |
fileAdded(java.lang.String path,
java.io.File file1,
java.io.File file2,
long revision1,
long revision2,
java.lang.String mimeType1,
java.lang.String mimeType2,
SVNProperties originalProperties,
SVNProperties diff,
boolean[] isTreeConflicted) |
SVNStatusType[] |
fileChanged(java.lang.String path,
java.io.File file1,
java.io.File file2,
long revision1,
long revision2,
java.lang.String mimeType1,
java.lang.String mimeType2,
SVNProperties originalProperties,
SVNProperties diff,
boolean[] isTreeConflicted) |
SVNStatusType |
fileDeleted(java.lang.String path,
java.io.File file1,
java.io.File file2,
java.lang.String mimeType1,
java.lang.String mimeType2,
SVNProperties originalProperties,
boolean[] isTreeConflicted) |
java.util.Map |
getConflictedPaths() |
protected java.io.File |
getFile(java.lang.String path) |
boolean |
isDiffCopiedAsAdded() |
boolean |
isDiffUnversioned() |
SVNStatusType |
propertiesChanged(java.lang.String path,
SVNProperties originalProperties,
SVNProperties diff,
boolean[] isTreeConflicted) |
protected SVNAdminArea |
retrieve(java.io.File path,
boolean lenient) |
addDeletedPath, categorizeProperties, clearDeletedPaths, getAdminArea, getDisplayPath, getWCAccess, isPathDeleted, setBasePath, setIsConflicted
protected boolean myIsDryRun
protected SVNURL myURL
protected boolean myIsAddNecessitatedMerge
protected java.lang.String myAddedPath
protected boolean myIsForce
protected SVNDiffOptions myDiffOptions
protected java.util.Map myConflictedPaths
protected SVNMergeDriver myMergeDriver
public SVNMergeCallback(SVNAdminArea adminArea, SVNURL url, boolean force, boolean dryRun, SVNDiffOptions options, java.util.Map conflictedPathsGetter, SVNMergeDriver mergeDriver)
public java.io.File createTempDirectory() throws SVNException
createTempDirectory
in class AbstractDiffCallback
SVNException
public boolean isDiffUnversioned()
isDiffUnversioned
in class AbstractDiffCallback
public boolean isDiffCopiedAsAdded()
isDiffCopiedAsAdded
in class AbstractDiffCallback
public java.util.Map getConflictedPaths()
public SVNStatusType propertiesChanged(java.lang.String path, SVNProperties originalProperties, SVNProperties diff, boolean[] isTreeConflicted) throws SVNException
propertiesChanged
in class AbstractDiffCallback
SVNException
public SVNStatusType directoryAdded(java.lang.String path, long revision, boolean[] isTreeConflicted) throws SVNException
directoryAdded
in class AbstractDiffCallback
SVNException
public SVNStatusType directoryDeleted(java.lang.String path, boolean[] isTreeConflicted) throws SVNException
directoryDeleted
in class AbstractDiffCallback
SVNException
public void directoryOpened(java.lang.String path, long revision, boolean[] isTreeConflicted) throws SVNException
directoryOpened
in class AbstractDiffCallback
SVNException
public SVNStatusType[] fileChanged(java.lang.String path, java.io.File file1, java.io.File file2, long revision1, long revision2, java.lang.String mimeType1, java.lang.String mimeType2, SVNProperties originalProperties, SVNProperties diff, boolean[] isTreeConflicted) throws SVNException
fileChanged
in class AbstractDiffCallback
SVNException
public SVNStatusType[] fileAdded(java.lang.String path, java.io.File file1, java.io.File file2, long revision1, long revision2, java.lang.String mimeType1, java.lang.String mimeType2, SVNProperties originalProperties, SVNProperties diff, boolean[] isTreeConflicted) throws SVNException
fileAdded
in class AbstractDiffCallback
SVNException
public SVNStatusType fileDeleted(java.lang.String path, java.io.File file1, java.io.File file2, java.lang.String mimeType1, java.lang.String mimeType2, SVNProperties originalProperties, boolean[] isTreeConflicted) throws SVNException
fileDeleted
in class AbstractDiffCallback
SVNException
public SVNStatusType[] directoryClosed(java.lang.String path, boolean[] isTreeConflicted) throws SVNException
directoryClosed
in class AbstractDiffCallback
SVNException
protected java.io.File getFile(java.lang.String path)
protected SVNAdminArea retrieve(java.io.File path, boolean lenient) throws SVNException
SVNException
protected void delete(java.io.File path, boolean force, boolean dryRun, boolean keepLocal) throws SVNException
SVNException
protected boolean areFilesTheSame(java.io.File older, SVNProperties originalProps, java.io.File mine, SVNAdminArea adminArea) throws SVNException
SVNException
Copyright © 2004-2012 TMate Software Ltd. All Rights Reserved.