Class SvnNgMergeReintegrate
- java.lang.Object
-
- org.tmatesoft.svn.core.internal.wc2.SvnOperationRunner<V,T>
-
- org.tmatesoft.svn.core.internal.wc2.SvnLocalOperationRunner<V,T>
-
- org.tmatesoft.svn.core.internal.wc2.ng.SvnNgOperationRunner<java.lang.Void,SvnMerge>
-
- org.tmatesoft.svn.core.internal.wc2.ng.SvnNgMergeReintegrate
-
- All Implemented Interfaces:
ISVNCanceller
,ISVNEventHandler
,ISvnOperationRunner<java.lang.Void,SvnMerge>
public class SvnNgMergeReintegrate extends SvnNgOperationRunner<java.lang.Void,SvnMerge>
-
-
Nested Class Summary
Nested Classes Modifier and Type Class Description private static class
SvnNgMergeReintegrate.UnmergedMergeInfo
-
Field Summary
-
Fields inherited from interface org.tmatesoft.svn.core.ISVNCanceller
NULL
-
Fields inherited from interface org.tmatesoft.svn.core.wc.ISVNEventHandler
UNKNOWN
-
-
Constructor Summary
Constructors Constructor Description SvnNgMergeReintegrate()
-
Method Summary
All Methods Instance Methods Concrete Methods Modifier and Type Method 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)
-
Methods inherited from class org.tmatesoft.svn.core.internal.wc2.ng.SvnNgOperationRunner
deleteDeleteFiles, getRepositoryAccess, getWcGeneration, matchesChangelist, reset, run, setRepositoryAccess
-
Methods inherited from class org.tmatesoft.svn.core.internal.wc2.SvnLocalOperationRunner
getFirstTarget, sleepForTimestamp
-
Methods inherited from class org.tmatesoft.svn.core.internal.wc2.SvnOperationRunner
checkCancelled, getOperation, getWcContext, handleEvent, handleEvent, run, setOperation, setWcContext
-
-
-
-
Method Detail
-
isApplicable
public boolean isApplicable(SvnMerge operation, SvnWcGeneration wcGeneration) throws SVNException
Description copied from interface:ISvnOperationRunner
Returns whether this runner is applicable for the operation on concrete working copy generation (1.7 or 1.6)- Specified by:
isApplicable
in interfaceISvnOperationRunner<java.lang.Void,SvnMerge>
- Overrides:
isApplicable
in classSvnLocalOperationRunner<java.lang.Void,SvnMerge>
- Parameters:
operation
- operation that needs runnerwcGeneration
- working copy generation- Returns:
true
if the runner is applicable, otherwisefalse
- Throws:
SVNException
-
run
protected java.lang.Void run(SVNWCContext context) throws SVNException
- Specified by:
run
in classSvnNgOperationRunner<java.lang.Void,SvnMerge>
- Throws:
SVNException
-
getLockPath
private java.io.File getLockPath(java.io.File firstTarget) throws SVNException
- Throws:
SVNException
-
merge
private void merge(SVNWCContext context, SvnTarget mergeSource, java.io.File mergeTarget, boolean dryRun) throws SVNException
- Throws:
SVNException
-
findUnsyncedRanges
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
- Throws:
SVNException
-
isMergeinfoInCatalog
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
- Throws:
SVNException
-
calculateLeftHandSide
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
- Throws:
SVNException
-
findUnmergedMergeInfo
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
- Throws:
SVNException
-
-