public class DefaultSVNMerger extends AbstractSVNMerger implements ISVNMerger
Modifier and Type | Field and Description |
---|---|
private ISVNConflictHandler |
myConflictCallback |
private SVNDiffConflictChoiceStyle |
myDiffConflictStyle |
private static java.util.List |
STATUS_ORDERING |
Constructor and Description |
---|
DefaultSVNMerger(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) |
Modifier and Type | Method and Description |
---|---|
private SVNStatusType |
applySingleGenericPropertyChange(java.lang.String localPath,
boolean isDir,
SVNStatusType status,
SVNProperties workingProps,
java.lang.String propName,
SVNPropertyValue baseValue,
SVNPropertyValue oldValue,
SVNPropertyValue newValue,
SVNPropertyValue workingValue,
SVNAdminArea adminArea,
SVNLog log,
java.util.Collection conflicts,
boolean dryRun) |
private SVNStatusType |
applySingleMergeInfoPropertyChange(java.lang.String localPath,
boolean isDir,
SVNStatusType status,
SVNProperties workingProps,
java.lang.String propName,
SVNPropertyValue baseValue,
SVNPropertyValue oldValue,
SVNPropertyValue newValue,
SVNPropertyValue workingValue,
SVNAdminArea adminArea,
SVNLog log,
java.util.Collection conflicts,
boolean dryRun) |
private SVNStatusType |
applySinglePropertyAdd(java.lang.String localPath,
boolean isDir,
SVNStatusType status,
SVNProperties workingProps,
java.lang.String propName,
SVNPropertyValue baseValue,
SVNPropertyValue newValue,
SVNPropertyValue workingValue,
SVNAdminArea adminArea,
SVNLog log,
java.util.Collection conflicts,
boolean dryRun) |
private SVNStatusType |
applySinglePropertyChange(java.lang.String localPath,
boolean isDir,
SVNStatusType status,
SVNProperties workingProps,
java.lang.String propName,
SVNPropertyValue baseValue,
SVNPropertyValue oldValue,
SVNPropertyValue newValue,
SVNPropertyValue workingValue,
SVNAdminArea adminArea,
SVNLog log,
java.util.Collection conflicts,
boolean dryRun) |
private SVNStatusType |
applySinglePropertyDelete(java.lang.String localPath,
boolean isDir,
SVNStatusType status,
SVNProperties workingProps,
java.lang.String propName,
SVNPropertyValue baseValue,
SVNPropertyValue oldValue,
SVNPropertyValue workingValue,
SVNAdminArea adminArea,
SVNLog log,
java.util.Collection conflicts,
boolean dryRun) |
private void |
changeProperty(SVNProperties properties,
java.lang.String propName,
SVNPropertyValue propValue) |
SVNDiffConflictChoiceStyle |
getDiffConflictStyle() |
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 |
handleChooseRepository(SVNMergeFileSet files) |
protected SVNMergeResult |
handleChooseWorking(SVNMergeFileSet files) |
protected SVNMergeResult |
handleMarkBinaryConflicted(SVNMergeFileSet files) |
protected SVNMergeResult |
handleMarkConflicted(SVNMergeFileSet files) |
protected SVNMergeResult |
handleMarkResolved(SVNMergeFileSet files,
SVNMergeResult mergeResult) |
protected SVNMergeResult |
handleMarkTextConflicted(SVNMergeFileSet files) |
protected void |
makeBinaryConflictEntry(SVNMergeFileSet files,
java.lang.String newFilePath,
java.lang.String oldFilePath) |
protected void |
makeTextConflictEntry(SVNMergeFileSet files,
java.lang.String mineFilePath,
java.lang.String newFilePath,
java.lang.String oldFilePath) |
private boolean |
maybeGeneratePropConflict(java.lang.String localPath,
java.lang.String propName,
SVNProperties workingProps,
SVNPropertyValue oldValue,
SVNPropertyValue newValue,
SVNPropertyValue baseValue,
SVNPropertyValue workingValue,
SVNAdminArea adminArea,
SVNLog log,
boolean isDir,
boolean dryRun) |
protected SVNStatusType |
mergeBinary(java.io.File baseFile,
java.io.File localFile,
java.io.File repositoryFile,
SVNDiffOptions options,
java.io.File resultFile) |
SVNMergeResult |
mergeProperties(java.lang.String localPath,
SVNProperties workingProperties,
SVNProperties baseProperties,
SVNProperties serverBaseProps,
SVNProperties propDiff,
SVNAdminArea adminArea,
SVNLog log,
boolean baseMerge,
boolean dryRun)
Given
adminArea /localPath and property changes (propDiff ) based
on serverBaseProps , merges the changes into the working copy. |
protected SVNStatusType |
mergeText(java.io.File baseFile,
java.io.File localFile,
java.io.File latestFile,
SVNDiffOptions options,
java.io.File resultFile) |
protected void |
postMergeCleanup(SVNMergeFileSet files) |
protected SVNMergeResult |
processMergedFiles(SVNMergeFileSet files,
SVNMergeResult mergeResult) |
void |
setDiffConflictStyle(SVNDiffConflictChoiceStyle diffConflictStyle) |
getConflictEndMarker, getConflictSeparatorMarker, getConflictStartMarker, getDiffOptions, mergeText
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
mergeText
private static java.util.List STATUS_ORDERING
private ISVNConflictHandler myConflictCallback
private SVNDiffConflictChoiceStyle myDiffConflictStyle
public DefaultSVNMerger(byte[] start, byte[] sep, byte[] end)
DefaultSVNMerger(byte[], byte[], byte[], ISVNConflictHandler, SVNDiffConflictChoiceStyle)
insteadstart
- sep
- end
- callback
- public DefaultSVNMerger(byte[] start, byte[] sep, byte[] end, ISVNConflictHandler callback)
DefaultSVNMerger(byte[], byte[], byte[], ISVNConflictHandler, SVNDiffConflictChoiceStyle)
insteadstart
- sep
- end
- callback
- public DefaultSVNMerger(byte[] start, byte[] sep, byte[] end, ISVNConflictHandler callback, SVNDiffConflictChoiceStyle style)
public SVNMergeResult mergeProperties(java.lang.String localPath, SVNProperties workingProperties, SVNProperties baseProperties, SVNProperties serverBaseProps, SVNProperties propDiff, SVNAdminArea adminArea, SVNLog log, boolean baseMerge, boolean dryRun) throws SVNException
ISVNMerger
adminArea
/localPath
and property changes (propDiff
) based
on serverBaseProps
, merges the changes into the working copy.mergeProperties
in interface ISVNMerger
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 doneSVNException
public SVNDiffConflictChoiceStyle getDiffConflictStyle()
public void setDiffConflictStyle(SVNDiffConflictChoiceStyle diffConflictStyle)
protected SVNStatusType mergeBinary(java.io.File baseFile, java.io.File localFile, java.io.File repositoryFile, SVNDiffOptions options, java.io.File resultFile) throws SVNException
mergeBinary
in class AbstractSVNMerger
SVNException
protected SVNStatusType mergeText(java.io.File baseFile, java.io.File localFile, java.io.File latestFile, SVNDiffOptions options, java.io.File resultFile) throws SVNException
mergeText
in class AbstractSVNMerger
SVNException
protected SVNMergeResult processMergedFiles(SVNMergeFileSet files, SVNMergeResult mergeResult) throws SVNException
processMergedFiles
in class AbstractSVNMerger
SVNException
protected DefaultSVNMergerAction getMergeAction(SVNMergeFileSet files, SVNMergeResult mergeResult) throws SVNException
SVNException
protected SVNMergeResult handleChooseBase(SVNMergeFileSet files) throws SVNException
SVNException
protected SVNMergeResult handleChooseRepository(SVNMergeFileSet files) throws SVNException
SVNException
protected SVNMergeResult handleChooseConflicted(boolean chooseMine, SVNMergeFileSet files) throws SVNException
SVNException
protected SVNMergeResult handleChooseWorking(SVNMergeFileSet files) throws SVNException
SVNException
protected SVNMergeResult handleMarkConflicted(SVNMergeFileSet files) throws SVNException
SVNException
protected SVNMergeResult handleMarkBinaryConflicted(SVNMergeFileSet files) throws SVNException
SVNException
protected void makeBinaryConflictEntry(SVNMergeFileSet files, java.lang.String newFilePath, java.lang.String oldFilePath) throws SVNException
SVNException
protected SVNMergeResult handleMarkTextConflicted(SVNMergeFileSet files) throws SVNException
SVNException
protected void makeTextConflictEntry(SVNMergeFileSet files, java.lang.String mineFilePath, java.lang.String newFilePath, java.lang.String oldFilePath) throws SVNException
SVNException
protected SVNMergeResult handleChooseMerged(SVNMergeFileSet files, SVNMergeResult mergeResult) throws SVNException
SVNException
protected SVNMergeResult handleMarkResolved(SVNMergeFileSet files, SVNMergeResult mergeResult) throws SVNException
SVNException
protected void postMergeCleanup(SVNMergeFileSet files) throws SVNException
SVNException
private SVNStatusType applySinglePropertyAdd(java.lang.String localPath, boolean isDir, SVNStatusType status, SVNProperties workingProps, java.lang.String propName, SVNPropertyValue baseValue, SVNPropertyValue newValue, SVNPropertyValue workingValue, SVNAdminArea adminArea, SVNLog log, java.util.Collection conflicts, boolean dryRun) throws SVNException
SVNException
private void changeProperty(SVNProperties properties, java.lang.String propName, SVNPropertyValue propValue)
private SVNStatusType applySinglePropertyChange(java.lang.String localPath, boolean isDir, SVNStatusType status, SVNProperties workingProps, java.lang.String propName, SVNPropertyValue baseValue, SVNPropertyValue oldValue, SVNPropertyValue newValue, SVNPropertyValue workingValue, SVNAdminArea adminArea, SVNLog log, java.util.Collection conflicts, boolean dryRun) throws SVNException
SVNException
private SVNStatusType applySingleMergeInfoPropertyChange(java.lang.String localPath, boolean isDir, SVNStatusType status, SVNProperties workingProps, java.lang.String propName, SVNPropertyValue baseValue, SVNPropertyValue oldValue, SVNPropertyValue newValue, SVNPropertyValue workingValue, SVNAdminArea adminArea, SVNLog log, java.util.Collection conflicts, boolean dryRun) throws SVNException
SVNException
private SVNStatusType applySingleGenericPropertyChange(java.lang.String localPath, boolean isDir, SVNStatusType status, SVNProperties workingProps, java.lang.String propName, SVNPropertyValue baseValue, SVNPropertyValue oldValue, SVNPropertyValue newValue, SVNPropertyValue workingValue, SVNAdminArea adminArea, SVNLog log, java.util.Collection conflicts, boolean dryRun) throws SVNException
SVNException
private SVNStatusType applySinglePropertyDelete(java.lang.String localPath, boolean isDir, SVNStatusType status, SVNProperties workingProps, java.lang.String propName, SVNPropertyValue baseValue, SVNPropertyValue oldValue, SVNPropertyValue workingValue, SVNAdminArea adminArea, SVNLog log, java.util.Collection conflicts, boolean dryRun) throws SVNException
SVNException
private static SVNStatusType getPropMergeStatus(SVNStatusType status, SVNStatusType newStatus)
private boolean maybeGeneratePropConflict(java.lang.String localPath, java.lang.String propName, SVNProperties workingProps, SVNPropertyValue oldValue, SVNPropertyValue newValue, SVNPropertyValue baseValue, SVNPropertyValue workingValue, SVNAdminArea adminArea, SVNLog log, boolean isDir, boolean dryRun) throws SVNException
SVNException