public class SvnNgMergeReintegrate extends SvnNgOperationRunner<java.lang.Void,SvnMerge>
Modifier and Type | Class and Description |
---|---|
private static class |
SvnNgMergeReintegrate.UnmergedMergeInfo |
UNKNOWN
NULL
Constructor and Description |
---|
SvnNgMergeReintegrate() |
Modifier and Type | Method and Description |
---|---|
private SvnTarget |
calculateLeftHandSide(SVNWCContext context,
java.util.Map<java.io.File,java.util.Map<java.lang.String,SVNMergeRangeList>> mergedToSourceCatalog,
java.util.Map<java.io.File,java.util.Map<java.lang.String,SVNMergeRangeList>> unmergedToSourceCatalog,
java.io.File targetAbsPath,
java.io.File targetReposRelPath,
java.util.Map<java.io.File,java.lang.String> subtreesWithMergeInfo,
long targetRev,
java.io.File sourceReposRelPath,
SVNURL sourceReposRoot,
SVNURL targetReposRoot,
long sourceRev,
SVNRepository sourceRepository,
SVNRepository targetRepository) |
private SvnNgMergeReintegrate.UnmergedMergeInfo |
findUnmergedMergeInfo(long ycAncestorRev,
java.util.Map<java.io.File,java.util.Map<java.lang.String,SVNMergeRangeList>> sourceCatalog,
java.util.Map<java.io.File,java.util.List<SVNLocationSegment>> targetSegments,
java.io.File sourceReposRelPath,
java.io.File targetReposRelPath,
long targetRev,
long sourceRev,
SVNRepository sourceRepos,
SVNRepository targetRepos) |
private void |
findUnsyncedRanges(java.io.File sourceReposRelPath,
java.io.File targetReposRelPath,
java.util.Map<java.io.File,java.util.Map<java.lang.String,SVNMergeRangeList>> unmergedToSourceCatalog,
java.util.Map<java.io.File,java.util.Map<java.lang.String,SVNMergeRangeList>> mergedToSourceCatalog,
java.util.Map<java.io.File,java.util.Map<java.lang.String,SVNMergeRangeList>> finalUnmergedCatalog,
SVNRepository repos) |
private java.io.File |
getLockPath(java.io.File firstTarget) |
boolean |
isApplicable(SvnMerge operation,
SvnWcGeneration wcGeneration)
Returns whether this runner is applicable for the operation on concrete working copy generation (1.7 or 1.6)
|
private boolean |
isMergeinfoInCatalog(java.io.File sourceRelpath,
java.io.File[] catPath,
java.util.Map<java.lang.String,SVNMergeRangeList> mergeinfo,
long revision,
java.util.Map<java.io.File,java.util.Map<java.lang.String,SVNMergeRangeList>> catalog) |
private void |
merge(SVNWCContext context,
SvnTarget mergeSource,
java.io.File mergeTarget,
boolean dryRun) |
protected java.lang.Void |
run(SVNWCContext context) |
deleteDeleteFiles, getRepositoryAccess, getWcGeneration, matchesChangelist, reset, run, setRepositoryAccess
getFirstTarget, sleepForTimestamp
checkCancelled, getOperation, getWcContext, handleEvent, handleEvent, run, setOperation, setWcContext
public boolean isApplicable(SvnMerge operation, SvnWcGeneration wcGeneration) throws SVNException
ISvnOperationRunner
isApplicable
in interface ISvnOperationRunner<java.lang.Void,SvnMerge>
isApplicable
in class SvnLocalOperationRunner<java.lang.Void,SvnMerge>
operation
- operation that needs runnerwcGeneration
- working copy generationtrue
if the runner is applicable, otherwise false
SVNException
protected java.lang.Void run(SVNWCContext context) throws SVNException
run
in class SvnNgOperationRunner<java.lang.Void,SvnMerge>
SVNException
private java.io.File getLockPath(java.io.File firstTarget) throws SVNException
SVNException
private void merge(SVNWCContext context, SvnTarget mergeSource, java.io.File mergeTarget, boolean dryRun) throws SVNException
SVNException
private void findUnsyncedRanges(java.io.File sourceReposRelPath, java.io.File targetReposRelPath, java.util.Map<java.io.File,java.util.Map<java.lang.String,SVNMergeRangeList>> unmergedToSourceCatalog, java.util.Map<java.io.File,java.util.Map<java.lang.String,SVNMergeRangeList>> mergedToSourceCatalog, java.util.Map<java.io.File,java.util.Map<java.lang.String,SVNMergeRangeList>> finalUnmergedCatalog, SVNRepository repos) throws SVNException
SVNException
private boolean isMergeinfoInCatalog(java.io.File sourceRelpath, java.io.File[] catPath, java.util.Map<java.lang.String,SVNMergeRangeList> mergeinfo, long revision, java.util.Map<java.io.File,java.util.Map<java.lang.String,SVNMergeRangeList>> catalog) throws SVNException
SVNException
private SvnTarget calculateLeftHandSide(SVNWCContext context, java.util.Map<java.io.File,java.util.Map<java.lang.String,SVNMergeRangeList>> mergedToSourceCatalog, java.util.Map<java.io.File,java.util.Map<java.lang.String,SVNMergeRangeList>> unmergedToSourceCatalog, java.io.File targetAbsPath, java.io.File targetReposRelPath, java.util.Map<java.io.File,java.lang.String> subtreesWithMergeInfo, long targetRev, java.io.File sourceReposRelPath, SVNURL sourceReposRoot, SVNURL targetReposRoot, long sourceRev, SVNRepository sourceRepository, SVNRepository targetRepository) throws SVNException
SVNException
private SvnNgMergeReintegrate.UnmergedMergeInfo findUnmergedMergeInfo(long ycAncestorRev, java.util.Map<java.io.File,java.util.Map<java.lang.String,SVNMergeRangeList>> sourceCatalog, java.util.Map<java.io.File,java.util.List<SVNLocationSegment>> targetSegments, java.io.File sourceReposRelPath, java.io.File targetReposRelPath, long targetRev, long sourceRev, SVNRepository sourceRepos, SVNRepository targetRepos) throws SVNException
SVNException