Uses of Class
org.tmatesoft.svn.core.SVNMergeRangeList
-
Packages that use SVNMergeRangeList 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.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.wc This package provides a high-level API for managing Working Copies in a way compatible with the native SVN command line client. -
-
Uses of SVNMergeRangeList in org.tigris.subversion.javahl
Methods in org.tigris.subversion.javahl with parameters of type SVNMergeRangeList Modifier and Type Method Description static RevisionRange[]
JavaHLObjectFactory. createRevisionRanges(SVNMergeRangeList rangeList)
-
Uses of SVNMergeRangeList in org.tmatesoft.svn.core
Methods in org.tmatesoft.svn.core that return SVNMergeRangeList Modifier and Type Method Description SVNMergeRangeList
SVNMergeRangeList. diff(SVNMergeRangeList eraserRangeList, boolean considerInheritance)
RemoveseraserRangeList
(the subtrahend) from this range list (the minuend), and places the resulting difference into a newSVNMergeRangeList
object.SVNMergeRangeList
SVNMergeRangeList. dup()
Makes a copy of this merge range list.static SVNMergeRangeList
SVNMergeRangeList. fromCollection(java.util.Collection mergeRanges)
Creates a newSVNMergeRangeList
from a collection ofmerge 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 andrangeList
and places the result into a newSVNMergeRangeList
object.SVNMergeRangeList
SVNMergeRangeList. merge(SVNMergeRangeList rangeList)
Merges two range lists placing the results into a newSVNMergeRangeList
object.SVNMergeRangeList
SVNMergeRangeList. mergeRevision(long revision)
SVNMergeRangeList
SVNMergeRangeList. remove(SVNMergeRangeList 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.Methods in org.tmatesoft.svn.core that return types with arguments of type SVNMergeRangeList Modifier and Type Method Description java.util.Map<java.lang.String,SVNMergeRangeList>
SVNMergeInfo. getMergeSourcesToMergeLists()
Returns a hash mapping merge sources to merge range lists.Methods in org.tmatesoft.svn.core with parameters of type SVNMergeRangeList Modifier and Type Method Description SVNMergeRangeList
SVNMergeRangeList. diff(SVNMergeRangeList eraserRangeList, boolean considerInheritance)
RemoveseraserRangeList
(the subtrahend) from this range list (the minuend), and places the resulting difference into a newSVNMergeRangeList
object.SVNMergeRangeList
SVNMergeRangeList. intersect(SVNMergeRangeList rangeList, boolean considerInheritance)
Finds the intersection of this range list andrangeList
and places the result into a newSVNMergeRangeList
object.SVNMergeRangeList
SVNMergeRangeList. merge(SVNMergeRangeList rangeList)
Merges two range lists placing the results into a newSVNMergeRangeList
object.SVNMergeRangeList
SVNMergeRangeList. remove(SVNMergeRangeList remove, boolean considerInheritance)
Constructor parameters in org.tmatesoft.svn.core with type arguments of type SVNMergeRangeList Constructor Description SVNMergeInfo(java.lang.String path, java.util.Map<java.lang.String,SVNMergeRangeList> srcsToRangeLists)
Creates a newSVNMergeInfo
object. -
Uses of SVNMergeRangeList in org.tmatesoft.svn.core.internal.util
Methods in org.tmatesoft.svn.core.internal.util that return SVNMergeRangeList Modifier and Type Method Description static SVNMergeRangeList[]
SVNMergeInfoUtil. diffMergeRangeLists(SVNMergeRangeList fromRangeList, SVNMergeRangeList toRangeList, boolean considerInheritance)
Methods in org.tmatesoft.svn.core.internal.util that return types with arguments of type SVNMergeRangeList Modifier and Type Method 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)
Methods in org.tmatesoft.svn.core.internal.util with parameters of type SVNMergeRangeList Modifier and Type Method Description static SVNMergeRangeList[]
SVNMergeInfoUtil. diffMergeRangeLists(SVNMergeRangeList fromRangeList, SVNMergeRangeList toRangeList, boolean considerInheritance)
Method parameters in org.tmatesoft.svn.core.internal.util with type arguments of type SVNMergeRangeList Modifier and Type Method 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.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. 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 boolean
SVNMergeInfoUtil. shouldElideMergeInfo(java.util.Map<java.lang.String,SVNMergeRangeList> parentMergeInfo, java.util.Map<java.lang.String,SVNMergeRangeList> childMergeInfo, java.lang.String pathSuffix)
-
Uses of SVNMergeRangeList in org.tmatesoft.svn.core.internal.wc
Fields in org.tmatesoft.svn.core.internal.wc declared as SVNMergeRangeList Modifier and Type Field Description SVNMergeRangeList
SVNMergeDriver.MergePath. myRemainingRanges
Methods in org.tmatesoft.svn.core.internal.wc that return types with arguments of type SVNMergeRangeList Modifier and Type Method Description static java.util.Map<java.lang.String,SVNMergeRangeList>
SVNMergeDriver. getMergeInfoFromSegments(java.util.Collection segments)
Methods in org.tmatesoft.svn.core.internal.wc with parameters of type SVNMergeRangeList Modifier and Type Method Description 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)
-
Uses of SVNMergeRangeList in org.tmatesoft.svn.core.internal.wc16
Methods in org.tmatesoft.svn.core.internal.wc16 that return types with arguments of type SVNMergeRangeList Modifier and Type Method Description java.util.Map<SVNURL,SVNMergeRangeList>
SVNDiffClient16. doGetMergedMergeInfo(java.io.File path, SVNRevision pegRevision)
Returns mergeinfo as aMap
with merge source URLs (asSVNURL
) mapped to range lists (SVNMergeRangeList
).java.util.Map<SVNURL,SVNMergeRangeList>
SVNDiffClient16. doGetMergedMergeInfo(SVNURL url, SVNRevision pegRevision)
Returns mergeinfo as aMap
with merge source URLs (asSVNURL
) mapped to range lists (SVNMergeRangeList
). -
Uses of SVNMergeRangeList in org.tmatesoft.svn.core.internal.wc2
Methods in org.tmatesoft.svn.core.internal.wc2 that return types with arguments of type SVNMergeRangeList Modifier and Type Method Description java.util.Map<java.lang.String,SVNMergeRangeList>
SvnRepositoryAccess. getHistoryAsMergeInfo(SVNRepository repos, SvnTarget target, long youngest, long oldest)
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)
-
Uses of SVNMergeRangeList in org.tmatesoft.svn.core.internal.wc2.ng
Fields in org.tmatesoft.svn.core.internal.wc2.ng declared as SVNMergeRangeList Modifier and Type Field Description protected SVNMergeRangeList
SvnNgMergeDriver. implicitSrcGap
protected SVNMergeRangeList
SvnNgMergeDriver.MergePath. remainingRanges
Fields in org.tmatesoft.svn.core.internal.wc2.ng with type parameters of type SVNMergeRangeList Modifier and Type Field Description protected java.util.Map<java.lang.String,SVNMergeRangeList>
SvnNgMergeDriver.MergePath. implicitMergeInfo
protected java.util.Map<java.lang.String,SVNMergeRangeList>
SvnNgMergeDriver.MergePath. preMergeMergeInfo
Methods in org.tmatesoft.svn.core.internal.wc2.ng that return types with arguments of type SVNMergeRangeList Modifier and Type Method 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)
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)
protected java.util.Map<java.lang.String,SVNMergeRangeList>[]
SvnNgMergeDriver. getFullMergeInfo(boolean getRecorded, boolean getImplicit, boolean[] inherited, SVNMergeInfoInheritance inherit, SVNRepository repos, java.io.File target, long start, long end)
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)
static java.util.Map<java.lang.String,SVNMergeRangeList>
SvnNgMergeinfoUtil. getWCOrReposMergeInfo(SVNWCContext context, java.io.File wcPath, SVNRepository repository, boolean reposOnly, SVNMergeInfoInheritance inheritance)
protected java.util.Map<SVNURL,SVNMergeRangeList>
SvnNgGetMergeInfo. run(SVNWCContext context)
Methods in org.tmatesoft.svn.core.internal.wc2.ng with parameters of type SVNMergeRangeList Modifier and Type Method Description 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)
Method parameters in org.tmatesoft.svn.core.internal.wc2.ng with type arguments of type SVNMergeRangeList Modifier and Type Method 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)
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)
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)
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)
-
Uses of SVNMergeRangeList in org.tmatesoft.svn.core.internal.wc2.old
Methods in org.tmatesoft.svn.core.internal.wc2.old that return types with arguments of type SVNMergeRangeList Modifier and Type Method Description protected java.util.Map<SVNURL,SVNMergeRangeList>
SvnOldGetMergeInfo. run()
-
Uses of SVNMergeRangeList in org.tmatesoft.svn.core.internal.wc2.patch
Method parameters in org.tmatesoft.svn.core.internal.wc2.patch with type arguments of type SVNMergeRangeList Modifier and Type Method Description void
SvnPatch. setMergeInfo(java.util.Map<java.lang.String,SVNMergeRangeList> mergeInfo)
-
Uses of SVNMergeRangeList in org.tmatesoft.svn.core.wc
Methods in org.tmatesoft.svn.core.wc that return types with arguments of type SVNMergeRangeList Modifier and Type Method Description java.util.Map<SVNURL,SVNMergeRangeList>
SVNDiffClient. doGetMergedMergeInfo(java.io.File path, SVNRevision pegRevision)
Returns mergeinfo as aMap
with merge source URLs (asSVNURL
) mapped to range lists (SVNMergeRangeList
).java.util.Map<SVNURL,SVNMergeRangeList>
SVNDiffClient. doGetMergedMergeInfo(SVNURL url, SVNRevision pegRevision)
Returns mergeinfo as aMap
with merge source URLs (asSVNURL
) mapped to range lists (SVNMergeRangeList
).
-