Class DefaultSVNMerger
java.lang.Object
org.tmatesoft.svn.core.internal.wc.AbstractSVNMerger
org.tmatesoft.svn.core.internal.wc.DefaultSVNMerger
- All Implemented Interfaces:
ISVNMerger
- Since:
- 1.2.0
- Version:
- 1.3
-
Field Summary
FieldsModifier and TypeFieldDescriptionprivate ISVNConflictHandler
private SVNDiffConflictChoiceStyle
private static List
-
Constructor Summary
ConstructorsConstructorDescriptionDefaultSVNMerger
(byte[] start, byte[] sep, byte[] end) Deprecated.DefaultSVNMerger
(byte[] start, byte[] sep, byte[] end, ISVNConflictHandler callback) Deprecated.DefaultSVNMerger
(byte[] start, byte[] sep, byte[] end, ISVNConflictHandler callback, SVNDiffConflictChoiceStyle style) -
Method Summary
Modifier and TypeMethodDescriptionprivate SVNStatusType
applySingleGenericPropertyChange
(String localPath, boolean isDir, SVNStatusType status, SVNProperties workingProps, String propName, SVNPropertyValue baseValue, SVNPropertyValue oldValue, SVNPropertyValue newValue, SVNPropertyValue workingValue, SVNAdminArea adminArea, SVNLog log, Collection conflicts, boolean dryRun) private SVNStatusType
applySingleMergeInfoPropertyChange
(String localPath, boolean isDir, SVNStatusType status, SVNProperties workingProps, String propName, SVNPropertyValue baseValue, SVNPropertyValue oldValue, SVNPropertyValue newValue, SVNPropertyValue workingValue, SVNAdminArea adminArea, SVNLog log, Collection conflicts, boolean dryRun) private SVNStatusType
applySinglePropertyAdd
(String localPath, boolean isDir, SVNStatusType status, SVNProperties workingProps, String propName, SVNPropertyValue baseValue, SVNPropertyValue newValue, SVNPropertyValue workingValue, SVNAdminArea adminArea, SVNLog log, Collection conflicts, boolean dryRun) private SVNStatusType
applySinglePropertyChange
(String localPath, boolean isDir, SVNStatusType status, SVNProperties workingProps, String propName, SVNPropertyValue baseValue, SVNPropertyValue oldValue, SVNPropertyValue newValue, SVNPropertyValue workingValue, SVNAdminArea adminArea, SVNLog log, Collection conflicts, boolean dryRun) private SVNStatusType
applySinglePropertyDelete
(String localPath, boolean isDir, SVNStatusType status, SVNProperties workingProps, String propName, SVNPropertyValue baseValue, SVNPropertyValue oldValue, SVNPropertyValue workingValue, SVNAdminArea adminArea, SVNLog log, Collection conflicts, boolean dryRun) private void
changeProperty
(SVNProperties properties, String propName, SVNPropertyValue propValue) protected DefaultSVNMergerAction
getMergeAction
(SVNMergeFileSet files, SVNMergeResult mergeResult) private static SVNStatusType
getPropMergeStatus
(SVNStatusType status, SVNStatusType newStatus) protected SVNMergeResult
handleChooseBase
(SVNMergeFileSet files) protected SVNMergeResult
handleChooseConflicted
(boolean chooseMine, SVNMergeFileSet files) protected SVNMergeResult
handleChooseMerged
(SVNMergeFileSet files, SVNMergeResult mergeResult) protected SVNMergeResult
protected SVNMergeResult
protected SVNMergeResult
protected SVNMergeResult
protected SVNMergeResult
handleMarkResolved
(SVNMergeFileSet files, SVNMergeResult mergeResult) protected SVNMergeResult
protected void
makeBinaryConflictEntry
(SVNMergeFileSet files, String newFilePath, String oldFilePath) protected void
makeTextConflictEntry
(SVNMergeFileSet files, String mineFilePath, String newFilePath, String oldFilePath) private boolean
maybeGeneratePropConflict
(String localPath, String propName, SVNProperties workingProps, SVNPropertyValue oldValue, SVNPropertyValue newValue, SVNPropertyValue baseValue, SVNPropertyValue workingValue, SVNAdminArea adminArea, SVNLog log, boolean isDir, boolean dryRun) protected SVNStatusType
mergeBinary
(File baseFile, File localFile, File repositoryFile, SVNDiffOptions options, File resultFile) mergeProperties
(String localPath, SVNProperties workingProperties, SVNProperties baseProperties, SVNProperties serverBaseProps, SVNProperties propDiff, SVNAdminArea adminArea, SVNLog log, boolean baseMerge, boolean dryRun) GivenadminArea
/localPath
and property changes (propDiff
) based onserverBaseProps
, merges the changes into the working copy.protected SVNStatusType
protected void
postMergeCleanup
(SVNMergeFileSet files) protected SVNMergeResult
processMergedFiles
(SVNMergeFileSet files, SVNMergeResult mergeResult) void
setDiffConflictStyle
(SVNDiffConflictChoiceStyle diffConflictStyle) Methods inherited from class org.tmatesoft.svn.core.internal.wc.AbstractSVNMerger
getConflictEndMarker, getConflictSeparatorMarker, getConflictStartMarker, getDiffOptions, mergeText
Methods inherited from class java.lang.Object
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
Methods inherited from interface org.tmatesoft.svn.core.wc.ISVNMerger
mergeText
-
Field Details
-
STATUS_ORDERING
-
myConflictCallback
-
myDiffConflictStyle
-
-
Constructor Details
-
DefaultSVNMerger
public DefaultSVNMerger(byte[] start, byte[] sep, byte[] end) Deprecated.- Parameters:
start
-sep
-end
-callback
-
-
DefaultSVNMerger
Deprecated.- Parameters:
start
-sep
-end
-callback
-
-
DefaultSVNMerger
public DefaultSVNMerger(byte[] start, byte[] sep, byte[] end, ISVNConflictHandler callback, SVNDiffConflictChoiceStyle style)
-
-
Method Details
-
mergeProperties
public SVNMergeResult mergeProperties(String localPath, SVNProperties workingProperties, SVNProperties baseProperties, SVNProperties serverBaseProps, SVNProperties propDiff, SVNAdminArea adminArea, SVNLog log, boolean baseMerge, boolean dryRun) throws SVNException Description copied from interface:ISVNMerger
GivenadminArea
/localPath
and property changes (propDiff
) based onserverBaseProps
, merges the changes into the working copy.- Specified by:
mergeProperties
in interfaceISVNMerger
- Parameters:
localPath
- working copy path base nameworkingProperties
- working propertiesbaseProperties
- pristine propertiesserverBaseProps
- properties that come from the serverpropDiff
- property changes that come from the repositoryadminArea
- admin area object representing the.svn<./code> admin area of the target which properties are merged
log
- loggerbaseMerge
- if false, then changes only working properties; otherwise, changes both the base and working propertiesdryRun
- if true, merge is simulated only, no real changes are done- Returns:
- result of merging
- Throws:
SVNException
-
getDiffConflictStyle
-
setDiffConflictStyle
-
mergeBinary
protected SVNStatusType mergeBinary(File baseFile, File localFile, File repositoryFile, SVNDiffOptions options, File resultFile) throws SVNException - Specified by:
mergeBinary
in classAbstractSVNMerger
- Throws:
SVNException
-
mergeText
protected SVNStatusType mergeText(File baseFile, File localFile, File latestFile, SVNDiffOptions options, File resultFile) throws SVNException - Specified by:
mergeText
in classAbstractSVNMerger
- Throws:
SVNException
-
processMergedFiles
protected SVNMergeResult processMergedFiles(SVNMergeFileSet files, SVNMergeResult mergeResult) throws SVNException - Specified by:
processMergedFiles
in classAbstractSVNMerger
- Throws:
SVNException
-
getMergeAction
protected DefaultSVNMergerAction getMergeAction(SVNMergeFileSet files, SVNMergeResult mergeResult) throws SVNException - Throws:
SVNException
-
handleChooseBase
- Throws:
SVNException
-
handleChooseRepository
- Throws:
SVNException
-
handleChooseConflicted
protected SVNMergeResult handleChooseConflicted(boolean chooseMine, SVNMergeFileSet files) throws SVNException - Throws:
SVNException
-
handleChooseWorking
- Throws:
SVNException
-
handleMarkConflicted
- Throws:
SVNException
-
handleMarkBinaryConflicted
- Throws:
SVNException
-
makeBinaryConflictEntry
protected void makeBinaryConflictEntry(SVNMergeFileSet files, String newFilePath, String oldFilePath) throws SVNException - Throws:
SVNException
-
handleMarkTextConflicted
- Throws:
SVNException
-
makeTextConflictEntry
protected void makeTextConflictEntry(SVNMergeFileSet files, String mineFilePath, String newFilePath, String oldFilePath) throws SVNException - Throws:
SVNException
-
handleChooseMerged
protected SVNMergeResult handleChooseMerged(SVNMergeFileSet files, SVNMergeResult mergeResult) throws SVNException - Throws:
SVNException
-
handleMarkResolved
protected SVNMergeResult handleMarkResolved(SVNMergeFileSet files, SVNMergeResult mergeResult) throws SVNException - Throws:
SVNException
-
postMergeCleanup
- Throws:
SVNException
-
applySinglePropertyAdd
private SVNStatusType applySinglePropertyAdd(String localPath, boolean isDir, SVNStatusType status, SVNProperties workingProps, String propName, SVNPropertyValue baseValue, SVNPropertyValue newValue, SVNPropertyValue workingValue, SVNAdminArea adminArea, SVNLog log, Collection conflicts, boolean dryRun) throws SVNException - Throws:
SVNException
-
changeProperty
-
applySinglePropertyChange
private SVNStatusType applySinglePropertyChange(String localPath, boolean isDir, SVNStatusType status, SVNProperties workingProps, String propName, SVNPropertyValue baseValue, SVNPropertyValue oldValue, SVNPropertyValue newValue, SVNPropertyValue workingValue, SVNAdminArea adminArea, SVNLog log, Collection conflicts, boolean dryRun) throws SVNException - Throws:
SVNException
-
applySingleMergeInfoPropertyChange
private SVNStatusType applySingleMergeInfoPropertyChange(String localPath, boolean isDir, SVNStatusType status, SVNProperties workingProps, String propName, SVNPropertyValue baseValue, SVNPropertyValue oldValue, SVNPropertyValue newValue, SVNPropertyValue workingValue, SVNAdminArea adminArea, SVNLog log, Collection conflicts, boolean dryRun) throws SVNException - Throws:
SVNException
-
applySingleGenericPropertyChange
private SVNStatusType applySingleGenericPropertyChange(String localPath, boolean isDir, SVNStatusType status, SVNProperties workingProps, String propName, SVNPropertyValue baseValue, SVNPropertyValue oldValue, SVNPropertyValue newValue, SVNPropertyValue workingValue, SVNAdminArea adminArea, SVNLog log, Collection conflicts, boolean dryRun) throws SVNException - Throws:
SVNException
-
applySinglePropertyDelete
private SVNStatusType applySinglePropertyDelete(String localPath, boolean isDir, SVNStatusType status, SVNProperties workingProps, String propName, SVNPropertyValue baseValue, SVNPropertyValue oldValue, SVNPropertyValue workingValue, SVNAdminArea adminArea, SVNLog log, Collection conflicts, boolean dryRun) throws SVNException - Throws:
SVNException
-
getPropMergeStatus
-
maybeGeneratePropConflict
private boolean maybeGeneratePropConflict(String localPath, String propName, SVNProperties workingProps, SVNPropertyValue oldValue, SVNPropertyValue newValue, SVNPropertyValue baseValue, SVNPropertyValue workingValue, SVNAdminArea adminArea, SVNLog log, boolean isDir, boolean dryRun) throws SVNException - Throws:
SVNException
-
DefaultSVNMerger(byte[], byte[], byte[], ISVNConflictHandler, SVNDiffConflictChoiceStyle)
instead