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 String
protected 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, Map conflictedPathsGetter, SVNMergeDriver mergeDriver) -
Method Summary
Modifier and TypeMethodDescriptionprotected boolean
areFilesTheSame
(File older, SVNProperties originalProps, File mine, SVNAdminArea adminArea) private boolean
arePropsTheSame
(SVNProperties props1, SVNProperties props2) protected void
directoryAdded
(String path, long revision, boolean[] isTreeConflicted) directoryClosed
(String path, boolean[] isTreeConflicted) directoryDeleted
(String path, boolean[] isTreeConflicted) void
directoryOpened
(String path, long revision, boolean[] isTreeConflicted) fileAdded
(String path, File file1, File file2, long revision1, long revision2, String mimeType1, String mimeType2, SVNProperties originalProperties, SVNProperties diff, boolean[] isTreeConflicted) fileChanged
(String path, File file1, File file2, long revision1, long revision2, String mimeType1, String mimeType2, SVNProperties originalProperties, SVNProperties diff, boolean[] isTreeConflicted) fileDeleted
(String path, File file1, File file2, String mimeType1, String mimeType2, SVNProperties originalProperties, boolean[] isTreeConflicted) private SVNNodeKind
getDiskKind
(String path) protected File
private SVNStatusType
private SVNNodeKind
getWorkingNodeKind
(SVNEntry entry, String path) boolean
boolean
propertiesChanged
(String path, SVNProperties originalProperties, SVNProperties diff, boolean[] isTreeConflicted) protected SVNAdminArea
Methods inherited from class org.tmatesoft.svn.core.internal.wc.AbstractDiffCallback
addDeletedPath, categorizeProperties, clearDeletedPaths, getAdminArea, getDisplayPath, getWCAccess, isPathDeleted, setBasePath, setIsConflicted
-
Field Details
-
myIsDryRun
protected boolean myIsDryRun -
myURL
-
myIsAddNecessitatedMerge
protected boolean myIsAddNecessitatedMerge -
myAddedPath
-
myIsForce
protected boolean myIsForce -
myDiffOptions
-
myConflictedPaths
-
myMergeDriver
-
-
Constructor Details
-
SVNMergeCallback
public SVNMergeCallback(SVNAdminArea adminArea, SVNURL url, boolean force, boolean dryRun, SVNDiffOptions options, 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
-
propertiesChanged
public SVNStatusType propertiesChanged(String path, SVNProperties originalProperties, SVNProperties diff, boolean[] isTreeConflicted) throws SVNException - Specified by:
propertiesChanged
in classAbstractDiffCallback
- Throws:
SVNException
-
directoryAdded
public SVNStatusType directoryAdded(String path, long revision, boolean[] isTreeConflicted) throws SVNException - Specified by:
directoryAdded
in classAbstractDiffCallback
- Throws:
SVNException
-
directoryDeleted
- Specified by:
directoryDeleted
in classAbstractDiffCallback
- Throws:
SVNException
-
directoryOpened
public void directoryOpened(String path, long revision, boolean[] isTreeConflicted) throws SVNException - Specified by:
directoryOpened
in classAbstractDiffCallback
- Throws:
SVNException
-
fileChanged
public SVNStatusType[] fileChanged(String path, File file1, File file2, long revision1, long revision2, String mimeType1, String mimeType2, SVNProperties originalProperties, SVNProperties diff, boolean[] isTreeConflicted) throws SVNException - Specified by:
fileChanged
in classAbstractDiffCallback
- Throws:
SVNException
-
fileAdded
public SVNStatusType[] fileAdded(String path, File file1, File file2, long revision1, long revision2, String mimeType1, String mimeType2, SVNProperties originalProperties, SVNProperties diff, boolean[] isTreeConflicted) throws SVNException - Specified by:
fileAdded
in classAbstractDiffCallback
- Throws:
SVNException
-
fileDeleted
public SVNStatusType fileDeleted(String path, File file1, File file2, String mimeType1, String mimeType2, SVNProperties originalProperties, boolean[] isTreeConflicted) throws SVNException - Specified by:
fileDeleted
in classAbstractDiffCallback
- Throws:
SVNException
-
directoryClosed
- Specified by:
directoryClosed
in classAbstractDiffCallback
- Throws:
SVNException
-
getFile
-
retrieve
- Throws:
SVNException
-
delete
protected void delete(File path, boolean force, boolean dryRun, boolean keepLocal) throws SVNException - Throws:
SVNException
-
areFilesTheSame
protected boolean areFilesTheSame(File older, SVNProperties originalProps, File mine, SVNAdminArea adminArea) throws SVNException - Throws:
SVNException
-
getStatusForObstructedOrMissing
-
getWorkingNodeKind
-
getDiskKind
-
arePropsTheSame
-