Class SVNMergeInfoUtil
java.lang.Object
org.tmatesoft.svn.core.internal.util.SVNMergeInfoUtil
public class SVNMergeInfoUtil
extends java.lang.Object
- Version:
- 1.3
-
Nested Class Summary
Nested ClassesModifier and TypeClassDescriptionprivate static classprivate static class -
Constructor Summary
Constructors -
Method Summary
Modifier and TypeMethodDescriptionstatic java.util.Map<java.lang.String,SVNMergeRangeList> 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> appendSuffix(java.util.Map<java.lang.String, SVNMergeRangeList> mergeinfo, java.lang.String suffix) static java.lang.StringcombineForkedMergeInfoProperties(java.lang.String fromPropValue, java.lang.String workingPropValue, java.lang.String toPropValue) static java.lang.StringcombineMergeInfoProperties(java.lang.String propValue1, java.lang.String propValue2) static voiddiffMergeInfo(java.util.Map deleted, java.util.Map added, java.util.Map from, java.util.Map to, boolean considerInheritance) static voiddiffMergeInfoProperties(java.util.Map deleted, java.util.Map added, java.lang.String fromPropValue, java.util.Map fromMergeInfo, java.lang.String toPropValue, java.util.Map toMergeInfo) static SVNMergeRangeList[]diffMergeRangeLists(SVNMergeRangeList fromRangeList, SVNMergeRangeList toRangeList, boolean considerInheritance) static java.util.MapdupCatalog(java.util.Map catalog) static java.util.MapdupMergeInfo(java.util.Map srcsToRangeLists, java.util.Map target) static voidelideMergeInfo(java.util.Map parentMergeInfo, java.util.Map childMergeInfo, java.io.File path, java.lang.String pathSuffix, SVNWCAccess access) static java.util.Map<java.lang.String,java.util.Map<java.lang.String, SVNMergeRangeList>> 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>> 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> filterMergeInfoByRanges(java.util.Map<java.lang.String, SVNMergeRangeList> mergeInfo, long youngestRev, long oldestRev) static java.lang.String[]findMergeSources(long revision, java.util.Map mergeInfo) static java.lang.StringformatMergeInfoCatalogToString(java.util.Map catalog, java.lang.String keyPrefix, java.lang.String valuePrefix) Note: Make sure that this method is used only for making up an error message.static java.lang.StringformatMergeInfoCatalogToString2(java.util.Map<java.io.File, java.util.Map<java.lang.String, SVNMergeRangeList>> catalog, java.lang.String keyPrefix, java.lang.String valuePrefix) static java.lang.String[]formatMergeInfoToArray(java.util.Map srcsToRangeLists, java.lang.String prefix) Each element of the resultant array is formed like this: %s:%ld-%ld,..static java.lang.StringformatMergeInfoToString(java.util.Map srcsToRangeLists, java.lang.String prefix) static java.util.Map<java.lang.String,SVNMergeRangeList> 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> getInheritableMergeInfo(java.util.Map<java.lang.String, SVNMergeRangeList> mergeInfo, java.lang.String path, long startRev, long endRev, boolean inheritable) static long[]getRangeEndPoints(java.util.Map<?, SVNMergeRangeList> mergeInfo) static java.util.MapintersectMergeInfo(java.util.Map mergeInfo1, java.util.Map mergeInfo2) static java.util.Map<java.lang.String,SVNMergeRangeList> intersectMergeInfo(java.util.Map mergeInfo1, java.util.Map mergeInfo2, boolean considerInheritance) static booleanisNonInheritable(java.util.Map<java.lang.String, SVNMergeRangeList> mergeInfo) static voidmergeCatalog(java.util.Map catalog, java.util.Map changes) static booleanmergeInfoEquals(java.util.Map mergeInfo1, java.util.Map mergeInfo2, boolean considerInheritance) static java.util.Map<java.lang.String,SVNMergeRangeList> 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> parseMergeInfo(java.lang.StringBuffer mergeInfo, java.util.Map<java.lang.String, SVNMergeRangeList> srcPathsToRangeLists) private static longparseRevision(java.lang.StringBuffer mergeInfo) static SVNMergeRange[]parseRevisionList(java.lang.StringBuffer mergeInfo, java.lang.String path) static booleanremoveEmptyRangeLists(java.util.Map mergeInfo) static java.util.Map<java.lang.String,SVNMergeRangeList> removeMergeInfo(java.util.Map<java.lang.String, SVNMergeRangeList> eraser, java.util.Map<java.lang.String, SVNMergeRangeList> whiteBoard, boolean considerInheritance) static java.util.MapremoveMergeInfo(java.util.Map eraser, java.util.Map whiteBoard) static booleanshouldElideMergeInfo(java.util.Map<java.lang.String, SVNMergeRangeList> parentMergeInfo, java.util.Map<java.lang.String, SVNMergeRangeList> childMergeInfo, java.lang.String pathSuffix) private static voidwalkMergeInfoHashForDiff(java.util.Map deleted, java.util.Map added, java.util.Map from, java.util.Map to, boolean considerInheritance) Methods inherited from class java.lang.Object
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
-
Constructor Details
-
SVNMergeInfoUtil
public SVNMergeInfoUtil()
-
-
Method Details
-
mergeCatalog
- Throws:
SVNException
-
filterCatalogByRanges
public static java.util.Map<java.lang.String,java.util.Map<java.lang.String, filterCatalogByRangesSVNMergeRangeList>> (java.util.Map<java.lang.String, java.util.Map<java.lang.String, SVNMergeRangeList>> catalog, long youngestRev, long oldestRev) -
filterMergeInfoByRanges
public static java.util.Map<java.lang.String,SVNMergeRangeList> filterMergeInfoByRanges(java.util.Map<java.lang.String, SVNMergeRangeList> mergeInfo, long youngestRev, long oldestRev) -
getRangeEndPoints
-
elideMergeInfoCatalog
public static java.util.Map<java.lang.String,java.util.Map<java.lang.String, elideMergeInfoCatalogSVNMergeRangeList>> (java.util.Map<java.lang.String, java.util.Map<java.lang.String, throws SVNExceptionSVNMergeRangeList>> mergeInfoCatalog) - Throws:
SVNException
-
adjustMergeInfoSourcePaths
public static java.util.Map<java.lang.String,SVNMergeRangeList> adjustMergeInfoSourcePaths(java.util.Map<java.lang.String, SVNMergeRangeList> mergeInfo, java.lang.String walkPath, java.util.Map<java.lang.String, SVNMergeRangeList> wcMergeInfo) -
removeEmptyRangeLists
public static boolean removeEmptyRangeLists(java.util.Map mergeInfo) -
mergeMergeInfos
public static java.util.Map<java.lang.String,SVNMergeRangeList> mergeMergeInfos(java.util.Map<java.lang.String, SVNMergeRangeList> originalSrcsToRangeLists, java.util.Map<java.lang.String, throws SVNExceptionSVNMergeRangeList> changedSrcsToRangeLists) - Throws:
SVNException
-
combineMergeInfoProperties
public static java.lang.String combineMergeInfoProperties(java.lang.String propValue1, java.lang.String propValue2) throws SVNException - Throws:
SVNException
-
combineForkedMergeInfoProperties
public static java.lang.String combineForkedMergeInfoProperties(java.lang.String fromPropValue, java.lang.String workingPropValue, java.lang.String toPropValue) throws SVNException - Throws:
SVNException
-
diffMergeInfoProperties
public static void diffMergeInfoProperties(java.util.Map deleted, java.util.Map added, java.lang.String fromPropValue, java.util.Map fromMergeInfo, java.lang.String toPropValue, java.util.Map toMergeInfo) throws SVNException - Throws:
SVNException
-
diffMergeInfo
public static void diffMergeInfo(java.util.Map deleted, java.util.Map added, java.util.Map from, java.util.Map to, boolean considerInheritance) -
dupCatalog
public static java.util.Map dupCatalog(java.util.Map catalog) -
dupMergeInfo
public static java.util.Map dupMergeInfo(java.util.Map srcsToRangeLists, java.util.Map target) -
isNonInheritable
-
parseMergeInfo
public static java.util.Map<java.lang.String,SVNMergeRangeList> parseMergeInfo(java.lang.StringBuffer mergeInfo, java.util.Map<java.lang.String, SVNMergeRangeList> srcPathsToRangeLists) throws SVNException- Throws:
SVNException
-
formatMergeInfoCatalogToString
public static java.lang.String formatMergeInfoCatalogToString(java.util.Map catalog, java.lang.String keyPrefix, java.lang.String valuePrefix) Note: Make sure that this method is used only for making up an error message. -
formatMergeInfoCatalogToString2
public static java.lang.String formatMergeInfoCatalogToString2(java.util.Map<java.io.File, java.util.Map<java.lang.String, SVNMergeRangeList>> catalog, java.lang.String keyPrefix, java.lang.String valuePrefix) -
formatMergeInfoToArray
public static java.lang.String[] formatMergeInfoToArray(java.util.Map srcsToRangeLists, java.lang.String prefix) Each element of the resultant array is formed like this: %s:%ld-%ld,.. where the first %s is a merge src path and %ld-%ld is startRev-endRev merge range. -
formatMergeInfoToString
public static java.lang.String formatMergeInfoToString(java.util.Map srcsToRangeLists, java.lang.String prefix) -
shouldElideMergeInfo
public static boolean shouldElideMergeInfo(java.util.Map<java.lang.String, SVNMergeRangeList> parentMergeInfo, java.util.Map<java.lang.String, SVNMergeRangeList> childMergeInfo, java.lang.String pathSuffix) -
elideMergeInfo
public static void elideMergeInfo(java.util.Map parentMergeInfo, java.util.Map childMergeInfo, java.io.File path, java.lang.String pathSuffix, SVNWCAccess access) throws SVNException - Throws:
SVNException
-
mergeInfoEquals
public static boolean mergeInfoEquals(java.util.Map mergeInfo1, java.util.Map mergeInfo2, boolean considerInheritance) -
findMergeSources
public static java.lang.String[] findMergeSources(long revision, java.util.Map mergeInfo) -
getInheritableMergeInfo
public static java.util.Map<java.lang.String,SVNMergeRangeList> getInheritableMergeInfo(java.util.Map<java.lang.String, SVNMergeRangeList> mergeInfo, java.lang.String path, long startRev, long endRev) -
getInheritableMergeInfo
public static java.util.Map<java.lang.String,SVNMergeRangeList> getInheritableMergeInfo(java.util.Map<java.lang.String, SVNMergeRangeList> mergeInfo, java.lang.String path, long startRev, long endRev, boolean inheritable) -
removeMergeInfo
public static java.util.Map removeMergeInfo(java.util.Map eraser, java.util.Map whiteBoard) -
removeMergeInfo
public static java.util.Map<java.lang.String,SVNMergeRangeList> removeMergeInfo(java.util.Map<java.lang.String, SVNMergeRangeList> eraser, java.util.Map<java.lang.String, SVNMergeRangeList> whiteBoard, boolean considerInheritance) -
intersectMergeInfo
public static java.util.Map intersectMergeInfo(java.util.Map mergeInfo1, java.util.Map mergeInfo2) -
intersectMergeInfo
public static java.util.Map<java.lang.String,SVNMergeRangeList> intersectMergeInfo(java.util.Map mergeInfo1, java.util.Map mergeInfo2, boolean considerInheritance) -
parseRevisionList
public static SVNMergeRange[] parseRevisionList(java.lang.StringBuffer mergeInfo, java.lang.String path) throws SVNException - Throws:
SVNException
-
appendSuffix
public static java.util.Map<java.lang.String,SVNMergeRangeList> appendSuffix(java.util.Map<java.lang.String, SVNMergeRangeList> mergeinfo, java.lang.String suffix) -
diffMergeRangeLists
public static SVNMergeRangeList[] diffMergeRangeLists(SVNMergeRangeList fromRangeList, SVNMergeRangeList toRangeList, boolean considerInheritance) - Returns:
- [deletedList, addedList]
-
parseRevision
- Throws:
SVNException
-
walkMergeInfoHashForDiff
private static void walkMergeInfoHashForDiff(java.util.Map deleted, java.util.Map added, java.util.Map from, java.util.Map to, boolean considerInheritance)
-