Class SVNMergeCallback
java.lang.Object
org.tmatesoft.svn.core.internal.wc.AbstractDiffCallback
org.tmatesoft.svn.core.internal.wc.SVNMergeCallback
- Direct Known Subclasses:
SVNMergeCallback15
- Version:
- 1.3
-
Field Summary
FieldsModifier and TypeFieldDescriptionprotected java.lang.String
protected java.util.Map
protected SVNDiffOptions
protected boolean
protected boolean
protected boolean
protected SVNMergeDriver
protected SVNURL
-
Constructor Summary
ConstructorsConstructorDescriptionSVNMergeCallback
(SVNAdminArea adminArea, SVNURL url, boolean force, boolean dryRun, SVNDiffOptions options, java.util.Map conflictedPathsGetter, SVNMergeDriver mergeDriver) -
Method Summary
Modifier and TypeMethodDescriptionprotected boolean
areFilesTheSame
(java.io.File older, SVNProperties originalProps, java.io.File mine, SVNAdminArea adminArea) private boolean
arePropsTheSame
(SVNProperties props1, SVNProperties props2) java.io.File
protected void
delete
(java.io.File path, boolean force, boolean dryRun, boolean keepLocal) directoryAdded
(java.lang.String path, long revision, boolean[] isTreeConflicted) directoryClosed
(java.lang.String path, boolean[] isTreeConflicted) directoryDeleted
(java.lang.String path, boolean[] isTreeConflicted) void
directoryOpened
(java.lang.String path, long revision, boolean[] isTreeConflicted) 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) 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) 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
private SVNNodeKind
getDiskKind
(java.lang.String path) protected java.io.File
getFile
(java.lang.String path) private SVNStatusType
getStatusForObstructedOrMissing
(java.lang.String path) private SVNNodeKind
getWorkingNodeKind
(SVNEntry entry, java.lang.String path) boolean
boolean
propertiesChanged
(java.lang.String path, SVNProperties originalProperties, SVNProperties diff, boolean[] isTreeConflicted) protected SVNAdminArea
retrieve
(java.io.File path, boolean lenient) Methods inherited from class org.tmatesoft.svn.core.internal.wc.AbstractDiffCallback
addDeletedPath, categorizeProperties, clearDeletedPaths, getAdminArea, getDisplayPath, getWCAccess, isPathDeleted, setBasePath, setIsConflicted
Methods inherited from class java.lang.Object
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
-
Field Details
-
myIsDryRun
protected boolean myIsDryRun -
myURL
-
myIsAddNecessitatedMerge
protected boolean myIsAddNecessitatedMerge -
myAddedPath
protected java.lang.String myAddedPath -
myIsForce
protected boolean myIsForce -
myDiffOptions
-
myConflictedPaths
protected java.util.Map myConflictedPaths -
myMergeDriver
-
-
Constructor Details
-
SVNMergeCallback
public SVNMergeCallback(SVNAdminArea adminArea, SVNURL url, boolean force, boolean dryRun, SVNDiffOptions options, java.util.Map conflictedPathsGetter, SVNMergeDriver mergeDriver)
-
-
Method Details
-
createTempDirectory
- Specified by:
createTempDirectory
in classAbstractDiffCallback
- Throws:
SVNException
-
isDiffUnversioned
public boolean isDiffUnversioned()- Specified by:
isDiffUnversioned
in classAbstractDiffCallback
-
isDiffCopiedAsAdded
public boolean isDiffCopiedAsAdded()- Specified by:
isDiffCopiedAsAdded
in classAbstractDiffCallback
-
getConflictedPaths
public java.util.Map getConflictedPaths() -
propertiesChanged
public SVNStatusType propertiesChanged(java.lang.String path, SVNProperties originalProperties, SVNProperties diff, boolean[] isTreeConflicted) throws SVNException - Specified by:
propertiesChanged
in classAbstractDiffCallback
- Throws:
SVNException
-
directoryAdded
public SVNStatusType directoryAdded(java.lang.String path, long revision, boolean[] isTreeConflicted) throws SVNException - Specified by:
directoryAdded
in classAbstractDiffCallback
- Throws:
SVNException
-
directoryDeleted
public SVNStatusType directoryDeleted(java.lang.String path, boolean[] isTreeConflicted) throws SVNException - Specified by:
directoryDeleted
in classAbstractDiffCallback
- Throws:
SVNException
-
directoryOpened
public void directoryOpened(java.lang.String path, long revision, boolean[] isTreeConflicted) throws SVNException - Specified by:
directoryOpened
in classAbstractDiffCallback
- Throws:
SVNException
-
fileChanged
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 - Specified by:
fileChanged
in classAbstractDiffCallback
- Throws:
SVNException
-
fileAdded
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 - Specified by:
fileAdded
in classAbstractDiffCallback
- Throws:
SVNException
-
fileDeleted
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 - Specified by:
fileDeleted
in classAbstractDiffCallback
- Throws:
SVNException
-
directoryClosed
public SVNStatusType[] directoryClosed(java.lang.String path, boolean[] isTreeConflicted) throws SVNException - Specified by:
directoryClosed
in classAbstractDiffCallback
- Throws:
SVNException
-
getFile
protected java.io.File getFile(java.lang.String path) -
retrieve
- Throws:
SVNException
-
delete
protected void delete(java.io.File path, boolean force, boolean dryRun, boolean keepLocal) throws SVNException - Throws:
SVNException
-
areFilesTheSame
protected boolean areFilesTheSame(java.io.File older, SVNProperties originalProps, java.io.File mine, SVNAdminArea adminArea) throws SVNException - Throws:
SVNException
-
getStatusForObstructedOrMissing
-
getWorkingNodeKind
-
getDiskKind
-
arePropsTheSame
-