Class SVNMergeCallback
- java.lang.Object
-
- org.tmatesoft.svn.core.internal.wc.AbstractDiffCallback
-
- org.tmatesoft.svn.core.internal.wc.SVNMergeCallback
-
- Direct Known Subclasses:
SVNMergeCallback15
public class SVNMergeCallback extends AbstractDiffCallback
- Version:
- 1.3
- Author:
- TMate Software Ltd.
-
-
Field Summary
Fields Modifier and Type Field 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 Summary
Constructors Constructor Description SVNMergeCallback(SVNAdminArea adminArea, SVNURL url, boolean force, boolean dryRun, SVNDiffOptions options, java.util.Map conflictedPathsGetter, SVNMergeDriver mergeDriver)
-
Method Summary
All Methods Instance Methods Concrete Methods Modifier and Type Method 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)
-
Methods inherited from class org.tmatesoft.svn.core.internal.wc.AbstractDiffCallback
addDeletedPath, categorizeProperties, clearDeletedPaths, getAdminArea, getDisplayPath, getWCAccess, isPathDeleted, setBasePath, setIsConflicted
-
-
-
-
Field Detail
-
myIsDryRun
protected boolean myIsDryRun
-
myURL
protected SVNURL myURL
-
myIsAddNecessitatedMerge
protected boolean myIsAddNecessitatedMerge
-
myAddedPath
protected java.lang.String myAddedPath
-
myIsForce
protected boolean myIsForce
-
myDiffOptions
protected SVNDiffOptions myDiffOptions
-
myConflictedPaths
protected java.util.Map myConflictedPaths
-
myMergeDriver
protected SVNMergeDriver myMergeDriver
-
-
Constructor Detail
-
SVNMergeCallback
public SVNMergeCallback(SVNAdminArea adminArea, SVNURL url, boolean force, boolean dryRun, SVNDiffOptions options, java.util.Map conflictedPathsGetter, SVNMergeDriver mergeDriver)
-
-
Method Detail
-
createTempDirectory
public java.io.File createTempDirectory() throws SVNException
- 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
protected SVNAdminArea retrieve(java.io.File path, boolean lenient) throws SVNException
- 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
-
-