Package | Description |
---|---|
org.tigris.subversion.javahl |
Provides a (mostly native, using JNI and javah) implementation of
a high level Java API for
Subversion.
|
org.tmatesoft.svn.core |
This package mostly contains common classes as well as interfaces used
throughout all the library.
|
org.tmatesoft.svn.core.internal.io.fs | |
org.tmatesoft.svn.core.internal.util | |
org.tmatesoft.svn.core.internal.wc | |
org.tmatesoft.svn.core.internal.wc16 | |
org.tmatesoft.svn.core.internal.wc2 | |
org.tmatesoft.svn.core.internal.wc2.ng | |
org.tmatesoft.svn.core.internal.wc2.old | |
org.tmatesoft.svn.core.internal.wc2.patch | |
org.tmatesoft.svn.core.javahl17 | |
org.tmatesoft.svn.core.wc |
This package provides a high-level API for managing Working Copies in a way
compatible with the native SVN command line client.
|
Modifier and Type | Method and Description |
---|---|
static RevisionRange[] |
JavaHLObjectFactory.createRevisionRanges(SVNMergeRangeList rangeList) |
Modifier and Type | Field and Description |
---|---|
private java.util.Map<java.lang.String,SVNMergeRangeList> |
SVNMergeInfo.myMergeSrcPathsToRangeLists |
Modifier and Type | Method and Description |
---|---|
SVNMergeRangeList |
SVNMergeRangeList.diff(SVNMergeRangeList eraserRangeList,
boolean considerInheritance)
Removes
eraserRangeList (the subtrahend) from this range list (the
minuend), and places the resulting difference into a new SVNMergeRangeList object. |
SVNMergeRangeList |
SVNMergeRangeList.dup()
Makes a copy of this merge range list.
|
static SVNMergeRangeList |
SVNMergeRangeList.fromCollection(java.util.Collection mergeRanges)
Creates a new
SVNMergeRangeList from a collection of
merge ranges . |
SVNMergeRangeList |
SVNMergeRangeList.getInheritableRangeList(long startRev,
long endRev)
Returns a sublist of this range list which excludes all non-inheritable merge ranges.
|
SVNMergeRangeList |
SVNMergeRangeList.getInheritableRangeList(long startRev,
long endRev,
boolean inheritable) |
SVNMergeRangeList |
SVNMergeRangeList.intersect(SVNMergeRangeList rangeList,
boolean considerInheritance)
Finds the intersection of this range list and
rangeList and places the result into
a new SVNMergeRangeList object. |
SVNMergeRangeList |
SVNMergeRangeList.merge(SVNMergeRangeList rangeList)
Merges two range lists placing the results into a new
SVNMergeRangeList object. |
SVNMergeRangeList |
SVNMergeRangeList.mergeRevision(long revision) |
SVNMergeRangeList |
SVNMergeRangeList.remove(SVNMergeRangeList remove,
boolean considerInheritance) |
private SVNMergeRangeList |
SVNMergeRangeList.removeOrIntersect(SVNMergeRangeList eraserRangeList,
boolean remove,
boolean considerInheritance) |
SVNMergeRangeList |
SVNMergeRangeList.reverse()
Reverses this range list, and the start and end fields of each
range in this range list, in place.
|
Modifier and Type | Method and Description |
---|---|
java.util.Map<java.lang.String,SVNMergeRangeList> |
SVNMergeInfo.getMergeSourcesToMergeLists()
Returns a hash mapping merge sources to merge range lists.
|
Modifier and Type | Method and Description |
---|---|
SVNMergeRangeList |
SVNMergeRangeList.diff(SVNMergeRangeList eraserRangeList,
boolean considerInheritance)
Removes
eraserRangeList (the subtrahend) from this range list (the
minuend), and places the resulting difference into a new SVNMergeRangeList object. |
SVNMergeRangeList |
SVNMergeRangeList.intersect(SVNMergeRangeList rangeList,
boolean considerInheritance)
Finds the intersection of this range list and
rangeList and places the result into
a new SVNMergeRangeList object. |
SVNMergeRangeList |
SVNMergeRangeList.merge(SVNMergeRangeList rangeList)
Merges two range lists placing the results into a new
SVNMergeRangeList object. |
SVNMergeRangeList |
SVNMergeRangeList.remove(SVNMergeRangeList remove,
boolean considerInheritance) |
private SVNMergeRangeList |
SVNMergeRangeList.removeOrIntersect(SVNMergeRangeList eraserRangeList,
boolean remove,
boolean considerInheritance) |
Constructor and Description |
---|
SVNMergeInfo(java.lang.String path,
java.util.Map<java.lang.String,SVNMergeRangeList> srcsToRangeLists)
Creates a new
SVNMergeInfo object. |
Modifier and Type | Field and Description |
---|---|
(package private) SVNMergeRangeList |
FSLog.RangeListPath.myRangeList |
Modifier and Type | Method and Description |
---|---|
static SVNMergeRangeList[] |
SVNMergeInfoUtil.diffMergeRangeLists(SVNMergeRangeList fromRangeList,
SVNMergeRangeList toRangeList,
boolean considerInheritance) |
Modifier and Type | Method and Description |
---|---|
static java.util.Map<java.lang.String,SVNMergeRangeList> |
SVNMergeInfoUtil.adjustMergeInfoSourcePaths(java.util.Map<java.lang.String,SVNMergeRangeList> mergeInfo,
java.lang.String walkPath,
java.util.Map<java.lang.String,SVNMergeRangeList> wcMergeInfo) |
static java.util.Map<java.lang.String,SVNMergeRangeList> |
SVNMergeInfoUtil.appendSuffix(java.util.Map<java.lang.String,SVNMergeRangeList> mergeinfo,
java.lang.String suffix) |
static java.util.Map<java.lang.String,java.util.Map<java.lang.String,SVNMergeRangeList>> |
SVNMergeInfoUtil.elideMergeInfoCatalog(java.util.Map<java.lang.String,java.util.Map<java.lang.String,SVNMergeRangeList>> mergeInfoCatalog) |
static java.util.Map<java.lang.String,java.util.Map<java.lang.String,SVNMergeRangeList>> |
SVNMergeInfoUtil.filterCatalogByRanges(java.util.Map<java.lang.String,java.util.Map<java.lang.String,SVNMergeRangeList>> catalog,
long youngestRev,
long oldestRev) |
static java.util.Map<java.lang.String,SVNMergeRangeList> |
SVNMergeInfoUtil.filterMergeInfoByRanges(java.util.Map<java.lang.String,SVNMergeRangeList> mergeInfo,
long youngestRev,
long oldestRev) |
static java.util.Map<java.lang.String,SVNMergeRangeList> |
SVNMergeInfoUtil.getInheritableMergeInfo(java.util.Map<java.lang.String,SVNMergeRangeList> mergeInfo,
java.lang.String path,
long startRev,
long endRev) |
static java.util.Map<java.lang.String,SVNMergeRangeList> |
SVNMergeInfoUtil.getInheritableMergeInfo(java.util.Map<java.lang.String,SVNMergeRangeList> mergeInfo,
java.lang.String path,
long startRev,
long endRev,
boolean inheritable) |
static java.util.Map<java.lang.String,SVNMergeRangeList> |
SVNMergeInfoUtil.intersectMergeInfo(java.util.Map mergeInfo1,
java.util.Map mergeInfo2,
boolean considerInheritance) |
static java.util.Map<java.lang.String,SVNMergeRangeList> |
SVNMergeInfoUtil.mergeMergeInfos(java.util.Map<java.lang.String,SVNMergeRangeList> originalSrcsToRangeLists,
java.util.Map<java.lang.String,SVNMergeRangeList> changedSrcsToRangeLists) |
static java.util.Map<java.lang.String,SVNMergeRangeList> |
SVNMergeInfoUtil.parseMergeInfo(java.lang.StringBuffer mergeInfo,
java.util.Map<java.lang.String,SVNMergeRangeList> srcPathsToRangeLists) |
static java.util.Map<java.lang.String,SVNMergeRangeList> |
SVNMergeInfoUtil.removeMergeInfo(java.util.Map<java.lang.String,SVNMergeRangeList> eraser,
java.util.Map<java.lang.String,SVNMergeRangeList> whiteBoard,
boolean considerInheritance) |
Modifier and Type | Method and Description |
---|---|
static SVNMergeRangeList[] |
SVNMergeInfoUtil.diffMergeRangeLists(SVNMergeRangeList fromRangeList,
SVNMergeRangeList toRangeList,
boolean considerInheritance) |
Modifier and Type | Method and Description |
---|---|
static java.util.Map<java.lang.String,SVNMergeRangeList> |
SVNMergeInfoUtil.adjustMergeInfoSourcePaths(java.util.Map<java.lang.String,SVNMergeRangeList> mergeInfo,
java.lang.String walkPath,
java.util.Map<java.lang.String,SVNMergeRangeList> wcMergeInfo) |
static java.util.Map<java.lang.String,SVNMergeRangeList> |
SVNMergeInfoUtil.adjustMergeInfoSourcePaths(java.util.Map<java.lang.String,SVNMergeRangeList> mergeInfo,
java.lang.String walkPath,
java.util.Map<java.lang.String,SVNMergeRangeList> wcMergeInfo) |
static java.util.Map<java.lang.String,SVNMergeRangeList> |
SVNMergeInfoUtil.appendSuffix(java.util.Map<java.lang.String,SVNMergeRangeList> mergeinfo,
java.lang.String suffix) |
static java.util.Map<java.lang.String,java.util.Map<java.lang.String,SVNMergeRangeList>> |
SVNMergeInfoUtil.elideMergeInfoCatalog(java.util.Map<java.lang.String,java.util.Map<java.lang.String,SVNMergeRangeList>> mergeInfoCatalog) |
static java.util.Map<java.lang.String,java.util.Map<java.lang.String,SVNMergeRangeList>> |
SVNMergeInfoUtil.filterCatalogByRanges(java.util.Map<java.lang.String,java.util.Map<java.lang.String,SVNMergeRangeList>> catalog,
long youngestRev,
long oldestRev) |
static java.util.Map<java.lang.String,SVNMergeRangeList> |
SVNMergeInfoUtil.filterMergeInfoByRanges(java.util.Map<java.lang.String,SVNMergeRangeList> mergeInfo,
long youngestRev,
long oldestRev) |
static java.lang.String |
SVNMergeInfoUtil.formatMergeInfoCatalogToString2(java.util.Map<java.io.File,java.util.Map<java.lang.String,SVNMergeRangeList>> catalog,
java.lang.String keyPrefix,
java.lang.String valuePrefix) |
static java.util.Map<java.lang.String,SVNMergeRangeList> |
SVNMergeInfoUtil.getInheritableMergeInfo(java.util.Map<java.lang.String,SVNMergeRangeList> mergeInfo,
java.lang.String path,
long startRev,
long endRev) |
static java.util.Map<java.lang.String,SVNMergeRangeList> |
SVNMergeInfoUtil.getInheritableMergeInfo(java.util.Map<java.lang.String,SVNMergeRangeList> mergeInfo,
java.lang.String path,
long startRev,
long endRev,
boolean inheritable) |
static long[] |
SVNMergeInfoUtil.getRangeEndPoints(java.util.Map<?,SVNMergeRangeList> mergeInfo) |
static boolean |
SVNMergeInfoUtil.isNonInheritable(java.util.Map<java.lang.String,SVNMergeRangeList> mergeInfo) |
static java.util.Map<java.lang.String,SVNMergeRangeList> |
SVNMergeInfoUtil.mergeMergeInfos(java.util.Map<java.lang.String,SVNMergeRangeList> originalSrcsToRangeLists,
java.util.Map<java.lang.String,SVNMergeRangeList> changedSrcsToRangeLists) |
static java.util.Map<java.lang.String,SVNMergeRangeList> |
SVNMergeInfoUtil.mergeMergeInfos(java.util.Map<java.lang.String,SVNMergeRangeList> originalSrcsToRangeLists,
java.util.Map<java.lang.String,SVNMergeRangeList> changedSrcsToRangeLists) |
static java.util.Map<java.lang.String,SVNMergeRangeList> |
SVNMergeInfoUtil.parseMergeInfo(java.lang.StringBuffer mergeInfo,
java.util.Map<java.lang.String,SVNMergeRangeList> srcPathsToRangeLists) |
static java.util.Map<java.lang.String,SVNMergeRangeList> |
SVNMergeInfoUtil.removeMergeInfo(java.util.Map<java.lang.String,SVNMergeRangeList> eraser,
java.util.Map<java.lang.String,SVNMergeRangeList> whiteBoard,
boolean considerInheritance) |
static java.util.Map<java.lang.String,SVNMergeRangeList> |
SVNMergeInfoUtil.removeMergeInfo(java.util.Map<java.lang.String,SVNMergeRangeList> eraser,
java.util.Map<java.lang.String,SVNMergeRangeList> whiteBoard,
boolean considerInheritance) |
static boolean |
SVNMergeInfoUtil.shouldElideMergeInfo(java.util.Map<java.lang.String,SVNMergeRangeList> parentMergeInfo,
java.util.Map<java.lang.String,SVNMergeRangeList> childMergeInfo,
java.lang.String pathSuffix) |
static boolean |
SVNMergeInfoUtil.shouldElideMergeInfo(java.util.Map<java.lang.String,SVNMergeRangeList> parentMergeInfo,
java.util.Map<java.lang.String,SVNMergeRangeList> childMergeInfo,
java.lang.String pathSuffix) |
Modifier and Type | Field and Description |
---|---|
private SVNMergeRangeList |
SVNMergeDriver.NoopLogHandler.mergedRanges |
private SVNMergeRangeList |
SVNMergeDriver.myImplicitSrcGap |
(package private) SVNMergeRangeList |
SVNMergeDriver.LogHandlerFilter.myRangeList |
SVNMergeRangeList |
SVNMergeDriver.MergePath.myRemainingRanges |
private SVNMergeRangeList |
SVNMergeDriver.NoopLogHandler.operativeRanges |
Modifier and Type | Method and Description |
---|---|
private SVNMergeRangeList |
SVNMergeDriver.filterNaturalHistoryFromMergeInfo(java.lang.String srcPath,
java.util.Map implicitMergeInfo,
SVNMergeRange requestedRange) |
private SVNMergeRangeList |
SVNMergeDriver.removeNoOpMergeRanges(SVNRepository repository,
SVNMergeRangeList ranges) |
Modifier and Type | Method and Description |
---|---|
static java.util.Map<java.lang.String,SVNMergeRangeList> |
SVNMergeDriver.getMergeInfoFromSegments(java.util.Collection segments) |
Modifier and Type | Method and Description |
---|---|
private void |
SVNMergeDriver.calculateMergeInheritance(SVNMergeRangeList rangeList,
SVNEntry entry,
boolean wcPathIsMergeTarget,
boolean wcPathHasMissingChild,
SVNDepth depth) |
void |
SVNMergeDriver.calculateRemainingRanges(SVNMergeDriver.MergePath parent,
SVNMergeDriver.MergePath child,
SVNURL sourceRootURL,
SVNURL url1,
long revision1,
SVNURL url2,
long revision2,
java.util.Map targetMergeInfo,
SVNMergeRangeList implicitSrcGap,
boolean isSubtree,
boolean childInheritsImplicit,
SVNEntry entry,
SVNRepository repository) |
protected void |
SVNMergeDriver.getLogsForMergeInfoRangeList(SVNURL reposRootURL,
java.lang.String[] paths,
SVNMergeRangeList rangeList,
boolean discoverChangedPaths,
java.lang.String[] revProps,
ISVNLogEntryHandler handler) |
private SVNMergeRangeList |
SVNMergeDriver.removeNoOpMergeRanges(SVNRepository repository,
SVNMergeRangeList ranges) |
Constructor and Description |
---|
LogHandlerFilter(ISVNLogEntryHandler handler,
SVNMergeRangeList rangeList) |
Modifier and Type | Method and Description |
---|---|
java.util.Map<SVNURL,SVNMergeRangeList> |
SVNDiffClient16.doGetMergedMergeInfo(java.io.File path,
SVNRevision pegRevision)
Returns mergeinfo as a
Map with merge source URLs (as
SVNURL ) mapped to range lists (SVNMergeRangeList ). |
java.util.Map<SVNURL,SVNMergeRangeList> |
SVNDiffClient16.doGetMergedMergeInfo(SVNURL url,
SVNRevision pegRevision)
Returns mergeinfo as a
Map with merge source URLs (as
SVNURL ) mapped to range lists (SVNMergeRangeList ). |
Modifier and Type | Method and Description |
---|---|
java.util.Map<java.lang.String,SVNMergeRangeList> |
SvnRepositoryAccess.getHistoryAsMergeInfo(SVNRepository repos,
SvnTarget target,
long youngest,
long oldest) |
private java.util.Map<java.lang.String,SVNMergeRangeList> |
SvnRepositoryAccess.getHistoryAsMergeInfo(SVNURL url,
SVNRevision pegRevision,
long rangeYoungest,
long rangeOldest,
boolean[] hasZero,
SVNRepository repos) |
static java.util.Map<java.lang.String,SVNMergeRangeList> |
SvnRepositoryAccess.getMergeInfoFromSegments(java.util.Collection<SVNLocationSegment> segments) |
java.util.Map<java.lang.String,SVNMergeRangeList> |
SvnRepositoryAccess.getReposMergeInfo(SVNRepository repository,
java.lang.String path,
long revision,
SVNMergeInfoInheritance inheritance,
boolean squelchIncapable) |
Modifier and Type | Field and Description |
---|---|
protected SVNMergeRangeList |
SvnNgMergeDriver.implicitSrcGap |
private SVNMergeRangeList |
SvnNgMergeDriver.NoopLogHandler.mergedRanges |
private SVNMergeRangeList |
SvnNgMergeDriver.NoopLogHandler.operativeRanges |
private SVNMergeRangeList |
SvnNgLogMergeInfo.LogEntryReceiver.rangelist |
protected SVNMergeRangeList |
SvnNgMergeDriver.MergePath.remainingRanges |
Modifier and Type | Field and Description |
---|---|
private java.util.Map<java.lang.String,java.util.Map<java.lang.String,SVNMergeRangeList>> |
SvnNgMergeReintegrate.UnmergedMergeInfo.catalog |
(package private) java.util.Map<java.lang.String,java.util.Map<java.lang.String,SVNMergeRangeList>> |
SvnNgMergeinfoUtil.SvnMergeInfoCatalogInfo.catalog |
protected java.util.Map<java.lang.String,SVNMergeRangeList> |
SvnNgMergeDriver.MergePath.implicitMergeInfo |
(package private) java.util.Map<java.lang.String,SVNMergeRangeList> |
SvnNgMergeinfoUtil.SvnMergeInfoInfo.mergeinfo |
private java.util.Map<java.lang.String,SVNMergeRangeList> |
SvnNgMergeCallback2.SplitMergeInfo.mergeInfo |
protected java.util.Map<java.lang.String,SVNMergeRangeList> |
SvnNgMergeDriver.MergePath.preMergeMergeInfo |
private java.util.Map<java.lang.String,java.util.Map<java.lang.String,SVNMergeRangeList>> |
SvnNgLogMergeInfo.LogEntryReceiver.targetCatalog |
private java.util.Map<java.lang.String,SVNMergeRangeList> |
SvnNgMergeCallback2.SplitMergeInfo.youngerMergeInfo |
Modifier and Type | Method and Description |
---|---|
private SVNMergeRangeList |
SvnNgMergeDriver.filterNaturalHistoryFromMergeInfo(java.lang.String srcPath,
java.util.Map<java.lang.String,SVNMergeRangeList> implicitMergeInfo,
SVNMergeRange requestedRange) |
private SVNMergeRangeList |
SvnNgMergeDriver.removeNoOpMergeRanges(SVNRepository repository,
SVNMergeRangeList ranges) |
Modifier and Type | Method and Description |
---|---|
static java.util.Map<java.lang.String,java.util.Map<java.lang.String,SVNMergeRangeList>> |
SvnNgMergeinfoUtil.addPrefixToCatalog(java.util.Map<java.lang.String,java.util.Map<java.lang.String,SVNMergeRangeList>> catalog,
java.io.File prefix) |
private java.util.Map<java.lang.String,SVNMergeRangeList> |
SvnNgWcToReposCopy.calculateTargetMergeInfo(java.io.File srcFile,
long srcRevision,
SVNRepository repository) |
private java.util.Map<java.lang.String,SVNMergeRangeList> |
SvnNgReposToWcCopy.calculateTargetMergeInfo(SVNURL srcURL,
long srcRevision,
SVNRepository repository) |
static java.util.Map<java.lang.String,java.util.Map<java.lang.String,SVNMergeRangeList>> |
SvnNgMergeinfoUtil.convertToCatalog(java.util.Map<java.lang.String,SVNMergeInfo> catalog) |
static java.util.Map<java.io.File,java.util.Map<java.lang.String,SVNMergeRangeList>> |
SvnNgMergeinfoUtil.convertToCatalog2(java.util.Map<java.lang.String,SVNMergeInfo> catalog) |
static java.util.Map<java.lang.String,java.util.Map<java.lang.String,SVNMergeRangeList>> |
SvnNgMergeinfoUtil.getMergeInfo(SVNWCContext context,
SvnRepositoryAccess repoAccess,
SvnTarget target,
boolean includeDescendants,
boolean ignoreInvalidMergeInfo,
SVNURL[] root) |
private java.util.TreeMap<java.io.File,java.util.Map<java.lang.String,SVNMergeRangeList>> |
SvnNgMergeDriver.getWcExplicitMergeInfoCatalog(java.io.File targetAbsPath,
SVNDepth depth) |
static java.util.Map<java.lang.String,SVNMergeRangeList> |
SvnNgMergeinfoUtil.getWCOrReposMergeInfo(SVNWCContext context,
java.io.File wcPath,
SVNRepository repository,
boolean reposOnly,
SVNMergeInfoInheritance inheritance) |
private static java.util.Map<java.lang.String,SVNMergeRangeList> |
SvnNgMergeinfoUtil.parseMergeInfo(SVNWCContext context,
java.io.File localAbsPath) |
protected java.util.Map<SVNURL,SVNMergeRangeList> |
SvnNgGetMergeInfo.run(SVNWCContext context) |
Modifier and Type | Method and Description |
---|---|
private boolean |
SvnNgMergeDriver.calculateMergeInheritance(SVNMergeRangeList rangeList,
java.io.File localAbsPath,
boolean wcPathIsMergeTarget,
boolean wcPathHasMissingChild,
SVNDepth depth) |
void |
SvnNgMergeDriver.calculateRemainingRanges(SvnNgMergeDriver.MergePath parent,
SvnNgMergeDriver.MergePath child,
SVNURL sourceRootURL,
SVNURL url1,
long revision1,
SVNURL url2,
long revision2,
java.util.Map targetMergeInfo,
SVNMergeRangeList implicitSrcGap,
boolean isSubtree,
boolean childInheritsImplicit,
SVNRepository repository) |
private void |
SvnNgLogMergeInfo.logForMergeInfoRangeList(SVNURL sourceURL,
java.util.List<java.lang.String> mergeSourcePaths,
boolean filteringMerged,
SVNMergeRangeList rangelist,
boolean oldestRevsFirst,
java.util.Map<java.lang.String,java.util.Map<java.lang.String,SVNMergeRangeList>> targetCatalog,
java.lang.String absReposTargetPath,
boolean discoverChangedPaths,
java.lang.String[] revprops,
ISvnObjectReceiver<SVNLogEntry> receiver) |
private void |
SvnNgMergeDriver.recordSkips(java.lang.String mergeInfoPath,
SVNMergeRangeList childMergeRangelist,
boolean isRollBack) |
private SVNMergeRangeList |
SvnNgMergeDriver.removeNoOpMergeRanges(SVNRepository repository,
SVNMergeRangeList ranges) |
private void |
SvnNgMergeCallback2.removeSourceGap(SVNMergeRange range,
SVNMergeRangeList implicitSrcGap) |
private void |
SvnNgMergeDriver.removeSourceGap(SVNMergeRange range,
SVNMergeRangeList implicitSrcGap) |
Modifier and Type | Method and Description |
---|---|
static java.util.Map<java.lang.String,java.util.Map<java.lang.String,SVNMergeRangeList>> |
SvnNgMergeinfoUtil.addPrefixToCatalog(java.util.Map<java.lang.String,java.util.Map<java.lang.String,SVNMergeRangeList>> catalog,
java.io.File prefix) |
private SvnTarget |
SvnNgMergeReintegrate.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 SvnTarget |
SvnNgMergeReintegrate.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) |
protected SvnSingleRangeConflictReport |
SvnNgMergeDriver.doDirectoryMerge(java.util.Map<java.io.File,java.util.Map<java.lang.String,SVNMergeRangeList>> resultCatalog,
SvnNgMergeDriver.MergeSource source,
java.io.File targetAbsPath,
SVNURL sourceRootUrl,
ISvnDiffCallback2 processor,
SVNDepth depth,
boolean squelchMergeinfoNotifications) |
private SvnSingleRangeConflictReport |
SvnNgMergeDriver.doFileMerge(java.io.File targetAbsPath,
java.util.Map<java.io.File,java.util.Map<java.lang.String,SVNMergeRangeList>> resultCatalog,
SvnNgMergeDriver.MergeSource source,
ISvnDiffCallback2 mergeProcessor,
boolean sourcesRelated,
boolean squelcheMergeInfoNotifications) |
protected SvnNgMergeDriver.MergeData |
SvnNgMergeDriver.doMerge(java.util.Map<java.io.File,java.util.Map<java.lang.String,SVNMergeRangeList>> resultCatalog,
java.util.List<SvnNgMergeDriver.MergeSource> mergeSources,
java.io.File targetAbsPath,
SVNRepository sourceRepository,
boolean sourcesRelated,
boolean sameRepository,
boolean ignoreMergeInfo,
boolean diffIgnoreAncestry,
boolean forceDelete,
boolean dryRun,
boolean recordOnly,
java.util.Collection<java.io.File> recordOnlyPaths,
boolean reintegrateMerge,
boolean squelcheMergeInfoNotifications,
SVNDepth depth,
SVNDiffOptions diffOptions) |
protected SvnSingleRangeConflictReport |
SvnNgMergeDriver.doMergeInfoAwareDirectoryMerge(java.util.Map<java.io.File,java.util.Map<java.lang.String,SVNMergeRangeList>> resultCatalog,
SvnNgMergeDriver.MergeSource source,
java.io.File targetPath,
SVNURL sourceRootUrl,
java.util.Map<java.io.File,SvnNgMergeDriver.MergePath> childrenWithMergeInfo,
SVNDepth depth,
boolean squelchMergeinfoNotifications,
ISvnDiffCallback2 processor) |
private static void |
SvnNgMergeinfoUtil.elideMergeInfo(SVNWCContext context,
java.util.Map<java.lang.String,SVNMergeRangeList> parent,
java.util.Map<java.lang.String,SVNMergeRangeList> child,
java.io.File targetAbsPath) |
private static void |
SvnNgMergeinfoUtil.elideMergeInfo(SVNWCContext context,
java.util.Map<java.lang.String,SVNMergeRangeList> parent,
java.util.Map<java.lang.String,SVNMergeRangeList> child,
java.io.File targetAbsPath) |
private SVNMergeRangeList |
SvnNgMergeDriver.filterNaturalHistoryFromMergeInfo(java.lang.String srcPath,
java.util.Map<java.lang.String,SVNMergeRangeList> implicitMergeInfo,
SVNMergeRange requestedRange) |
private SvnNgMergeReintegrate.UnmergedMergeInfo |
SvnNgMergeReintegrate.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 |
SvnNgMergeReintegrate.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 void |
SvnNgMergeReintegrate.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 void |
SvnNgMergeReintegrate.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 boolean |
SvnNgMergeReintegrate.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 boolean |
SvnNgMergeReintegrate.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 |
SvnNgLogMergeInfo.logForMergeInfoRangeList(SVNURL sourceURL,
java.util.List<java.lang.String> mergeSourcePaths,
boolean filteringMerged,
SVNMergeRangeList rangelist,
boolean oldestRevsFirst,
java.util.Map<java.lang.String,java.util.Map<java.lang.String,SVNMergeRangeList>> targetCatalog,
java.lang.String absReposTargetPath,
boolean discoverChangedPaths,
java.lang.String[] revprops,
ISvnObjectReceiver<SVNLogEntry> receiver) |
private void |
SvnNgMergeDriver.recordMergeinfo(java.io.File localAbsPath,
java.util.Map<java.lang.String,SVNMergeRangeList> mergeinfo,
boolean notify) |
protected void |
SvnNgMergeDriver.recordMergeInfoForDirectoryMerge(java.util.Map<java.io.File,java.util.Map<java.lang.String,SVNMergeRangeList>> resultCatalog,
SVNMergeRange mergeRange,
java.lang.String mergeInfoPath,
SVNDepth depth,
boolean squelchMergeinfoNotifications,
java.util.Map<java.io.File,SvnNgMergeDriver.MergePath> childrenWithMergeInfo) |
private SvnNgMergeCallback2.SplitMergeInfo |
SvnNgMergeCallback2.splitMergeInfoOnRevision(java.util.Map<java.lang.String,SVNMergeRangeList> mergeInfo,
long revision) |
private java.util.Map<java.lang.String,SVNMergeRangeList>[] |
SvnNgMergeCallback.splitMergeInfoOnRevision(java.util.Map<java.lang.String,SVNMergeRangeList> mergeinfo,
long revision) |
private void |
SvnNgMergeDriver.updateWCMergeInfo(java.util.Map<java.io.File,java.util.Map<java.lang.String,SVNMergeRangeList>> resultCatalog,
java.io.File targetAbsPath,
java.lang.String reposRelPath,
java.util.Map<java.io.File,SVNMergeRangeList> merges,
boolean isRollBack) |
private void |
SvnNgMergeDriver.updateWCMergeInfo(java.util.Map<java.io.File,java.util.Map<java.lang.String,SVNMergeRangeList>> resultCatalog,
java.io.File targetAbsPath,
java.lang.String reposRelPath,
java.util.Map<java.io.File,SVNMergeRangeList> merges,
boolean isRollBack) |
Modifier and Type | Method and Description |
---|---|
protected java.util.Map<SVNURL,SVNMergeRangeList> |
SvnOldGetMergeInfo.run() |
Modifier and Type | Field and Description |
---|---|
(package private) java.util.Map<java.lang.String,SVNMergeRangeList> |
SvnPatch.mergeInfo |
Modifier and Type | Method and Description |
---|---|
void |
SvnPatch.setMergeInfo(java.util.Map<java.lang.String,SVNMergeRangeList> mergeInfo) |
Modifier and Type | Method and Description |
---|---|
private Mergeinfo |
SVNClientImpl.getMergeinfo(java.util.Map<SVNURL,SVNMergeRangeList> mergeInfoMap) |
Modifier and Type | Method and Description |
---|---|
java.util.Map<SVNURL,SVNMergeRangeList> |
SVNDiffClient.doGetMergedMergeInfo(java.io.File path,
SVNRevision pegRevision)
Returns mergeinfo as a
Map with merge source URLs (as
SVNURL ) mapped to range lists (SVNMergeRangeList ). |
java.util.Map<SVNURL,SVNMergeRangeList> |
SVNDiffClient.doGetMergedMergeInfo(SVNURL url,
SVNRevision pegRevision)
Returns mergeinfo as a
Map with merge source URLs (as
SVNURL ) mapped to range lists (SVNMergeRangeList ). |