Package org.tmatesoft.svn.core.internal.wc2.ng

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<Void,SvnMerge>

org.tmatesoft.svn.core.internal.wc2.ng.SvnNgMergeReintegrate

All Implemented Interfaces:

ISVNCanceller, ISVNEventHandler, ISvnOperationRunner<Void,SvnMerge>

public class SvnNgMergeReintegrate
extends SvnNgOperationRunner<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

Modifier and Type	Method	Description
private SvnTarget	calculateLeftHandSide(SVNWCContext context, Map<File,Map<String,SVNMergeRangeList>> mergedToSourceCatalog, Map<File,Map<String,SVNMergeRangeList>> unmergedToSourceCatalog, File targetAbsPath, File targetReposRelPath, Map<File,String> subtreesWithMergeInfo, long targetRev, File sourceReposRelPath, SVNURL sourceReposRoot, SVNURL targetReposRoot, long sourceRev, SVNRepository sourceRepository, SVNRepository targetRepository)
private SvnNgMergeReintegrate.UnmergedMergeInfo	findUnmergedMergeInfo(long ycAncestorRev, Map<File,Map<String,SVNMergeRangeList>> sourceCatalog, Map<File,List<SVNLocationSegment>> targetSegments, File sourceReposRelPath, File targetReposRelPath, long targetRev, long sourceRev, SVNRepository sourceRepos, SVNRepository targetRepos)
private void	findUnsyncedRanges(File sourceReposRelPath, File targetReposRelPath, Map<File,Map<String,SVNMergeRangeList>> unmergedToSourceCatalog, Map<File,Map<String,SVNMergeRangeList>> mergedToSourceCatalog, Map<File,Map<String,SVNMergeRangeList>> finalUnmergedCatalog, SVNRepository repos)
private File	getLockPath(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(File sourceRelpath, File[] catPath, Map<String,SVNMergeRangeList> mergeinfo, long revision, Map<File,Map<String,SVNMergeRangeList>> catalog)
private void	merge(SVNWCContext context, SvnTarget mergeSource, File mergeTarget, boolean dryRun)
protected 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

Methods inherited from class java.lang.Object

clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait

Constructor Details

SvnNgMergeReintegrate

public SvnNgMergeReintegrate()

Method Details

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 interface ISvnOperationRunner<Void,SvnMerge>

Overrides:

isApplicable in class SvnLocalOperationRunner<Void,SvnMerge>

Parameters:

operation - operation that needs runner

wcGeneration - working copy generation

Returns:

true if the runner is applicable, otherwise false

Throws:

SVNException

run

protected Void run(SVNWCContext context)
            throws SVNException

Specified by:

run in class SvnNgOperationRunner<Void,SvnMerge>

Throws:

SVNException

getLockPath

private File getLockPath(File firstTarget)
                  throws SVNException

Throws:

SVNException

merge

private void merge(SVNWCContext context,
 SvnTarget mergeSource,
 File mergeTarget,
 boolean dryRun)
            throws SVNException

Throws:

SVNException

findUnsyncedRanges

private void findUnsyncedRanges(File sourceReposRelPath,
 File targetReposRelPath,
 Map<File,Map<String,SVNMergeRangeList>> unmergedToSourceCatalog,
 Map<File,Map<String,SVNMergeRangeList>> mergedToSourceCatalog,
 Map<File,Map<String,SVNMergeRangeList>> finalUnmergedCatalog,
 SVNRepository repos)
                         throws SVNException

Throws:

SVNException

isMergeinfoInCatalog

private boolean isMergeinfoInCatalog(File sourceRelpath,
 File[] catPath,
 Map<String,SVNMergeRangeList> mergeinfo,
 long revision,
 Map<File,Map<String,SVNMergeRangeList>> catalog)
                              throws SVNException

Throws:

SVNException

calculateLeftHandSide

private SvnTarget calculateLeftHandSide(SVNWCContext context,
 Map<File,Map<String,SVNMergeRangeList>> mergedToSourceCatalog,
 Map<File,Map<String,SVNMergeRangeList>> unmergedToSourceCatalog,
 File targetAbsPath,
 File targetReposRelPath,
 Map<File,String> subtreesWithMergeInfo,
 long targetRev,
 File sourceReposRelPath,
 SVNURL sourceReposRoot,
 SVNURL targetReposRoot,
 long sourceRev,
 SVNRepository sourceRepository,
 SVNRepository targetRepository)
                                 throws SVNException

Throws:

SVNException

findUnmergedMergeInfo

private SvnNgMergeReintegrate.UnmergedMergeInfo findUnmergedMergeInfo(long ycAncestorRev,
 Map<File,Map<String,SVNMergeRangeList>> sourceCatalog,
 Map<File,List<SVNLocationSegment>> targetSegments,
 File sourceReposRelPath,
 File targetReposRelPath,
 long targetRev,
 long sourceRev,
 SVNRepository sourceRepos,
 SVNRepository targetRepos)
                                                               throws SVNException

Throws:

SVNException