Package org.tmatesoft.svn.core.internal.util

Class SVNMergeInfoUtil

java.lang.Object

org.tmatesoft.svn.core.internal.util.SVNMergeInfoUtil

public class SVNMergeInfoUtil
extends Object

Version:

1.3

Nested Class Summary

Nested Classes

Modifier and Type	Class	Description
private static class	SVNMergeInfoUtil.ElideMergeInfoCatalogHandler
private static class	SVNMergeInfoUtil.ElideMergeInfoEditor

Constructor Summary

Constructors

Constructor	Description
SVNMergeInfoUtil()

Method Summary

Modifier and Type	Method	Description
static Map<String,SVNMergeRangeList>	adjustMergeInfoSourcePaths(Map<String,SVNMergeRangeList> mergeInfo, String walkPath, Map<String,SVNMergeRangeList> wcMergeInfo)
static Map<String,SVNMergeRangeList>	appendSuffix(Map<String,SVNMergeRangeList> mergeinfo, String suffix)
static String	combineForkedMergeInfoProperties(String fromPropValue, String workingPropValue, String toPropValue)
static String	combineMergeInfoProperties(String propValue1, String propValue2)
static void	diffMergeInfo(Map deleted, Map added, Map from, Map to, boolean considerInheritance)
static void	diffMergeInfoProperties(Map deleted, Map added, String fromPropValue, Map fromMergeInfo, String toPropValue, Map toMergeInfo)
static SVNMergeRangeList[]	diffMergeRangeLists(SVNMergeRangeList fromRangeList, SVNMergeRangeList toRangeList, boolean considerInheritance)
static Map	dupCatalog(Map catalog)
static Map	dupMergeInfo(Map srcsToRangeLists, Map target)
static void	elideMergeInfo(Map parentMergeInfo, Map childMergeInfo, File path, String pathSuffix, SVNWCAccess access)
static Map<String,Map<String,SVNMergeRangeList>>	elideMergeInfoCatalog(Map<String,Map<String,SVNMergeRangeList>> mergeInfoCatalog)
static Map<String,Map<String,SVNMergeRangeList>>	filterCatalogByRanges(Map<String,Map<String,SVNMergeRangeList>> catalog, long youngestRev, long oldestRev)
static Map<String,SVNMergeRangeList>	filterMergeInfoByRanges(Map<String,SVNMergeRangeList> mergeInfo, long youngestRev, long oldestRev)
static String[]	findMergeSources(long revision, Map mergeInfo)
static String	formatMergeInfoCatalogToString(Map catalog, String keyPrefix, String valuePrefix)	Note: Make sure that this method is used only for making up an error message.
static String	formatMergeInfoCatalogToString2(Map<File,Map<String,SVNMergeRangeList>> catalog, String keyPrefix, String valuePrefix)
static String[]	formatMergeInfoToArray(Map srcsToRangeLists, String prefix)	Each element of the resultant array is formed like this: %s:%ld-%ld,..
static String	formatMergeInfoToString(Map srcsToRangeLists, String prefix)
static Map<String,SVNMergeRangeList>	getInheritableMergeInfo(Map<String,SVNMergeRangeList> mergeInfo, String path, long startRev, long endRev)
static Map<String,SVNMergeRangeList>	getInheritableMergeInfo(Map<String,SVNMergeRangeList> mergeInfo, String path, long startRev, long endRev, boolean inheritable)
static long[]	getRangeEndPoints(Map<?,SVNMergeRangeList> mergeInfo)
static Map	intersectMergeInfo(Map mergeInfo1, Map mergeInfo2)
static Map<String,SVNMergeRangeList>	intersectMergeInfo(Map mergeInfo1, Map mergeInfo2, boolean considerInheritance)
static boolean	isNonInheritable(Map<String,SVNMergeRangeList> mergeInfo)
static void	mergeCatalog(Map catalog, Map changes)
static boolean	mergeInfoEquals(Map mergeInfo1, Map mergeInfo2, boolean considerInheritance)
static Map<String,SVNMergeRangeList>	mergeMergeInfos(Map<String,SVNMergeRangeList> originalSrcsToRangeLists, Map<String,SVNMergeRangeList> changedSrcsToRangeLists)
static Map<String,SVNMergeRangeList>	parseMergeInfo(StringBuffer mergeInfo, Map<String,SVNMergeRangeList> srcPathsToRangeLists)
private static long	parseRevision(StringBuffer mergeInfo)
static SVNMergeRange[]	parseRevisionList(StringBuffer mergeInfo, String path)
static boolean	removeEmptyRangeLists(Map mergeInfo)
static Map<String,SVNMergeRangeList>	removeMergeInfo(Map<String,SVNMergeRangeList> eraser, Map<String,SVNMergeRangeList> whiteBoard, boolean considerInheritance)
static Map	removeMergeInfo(Map eraser, Map whiteBoard)
static boolean	shouldElideMergeInfo(Map<String,SVNMergeRangeList> parentMergeInfo, Map<String,SVNMergeRangeList> childMergeInfo, String pathSuffix)
private static void	walkMergeInfoHashForDiff(Map deleted, Map added, Map from, 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

public static void mergeCatalog(Map catalog,
 Map changes)
                         throws SVNException

Throws:

SVNException

filterCatalogByRanges

public static Map<String,Map<String,SVNMergeRangeList>> filterCatalogByRanges(Map<String,Map<String,SVNMergeRangeList>> catalog,
 long youngestRev,
 long oldestRev)

filterMergeInfoByRanges

public static Map<String,SVNMergeRangeList> filterMergeInfoByRanges(Map<String,SVNMergeRangeList> mergeInfo,
 long youngestRev,
 long oldestRev)

getRangeEndPoints

public static long[] getRangeEndPoints(Map<?,SVNMergeRangeList> mergeInfo)

elideMergeInfoCatalog

public static Map<String,Map<String,SVNMergeRangeList>> elideMergeInfoCatalog(Map<String,Map<String,SVNMergeRangeList>> mergeInfoCatalog)
                                                                       throws SVNException

Throws:

SVNException

adjustMergeInfoSourcePaths

public static Map<String,SVNMergeRangeList> adjustMergeInfoSourcePaths(Map<String,SVNMergeRangeList> mergeInfo,
 String walkPath,
 Map<String,SVNMergeRangeList> wcMergeInfo)

removeEmptyRangeLists

public static boolean removeEmptyRangeLists(Map mergeInfo)

mergeMergeInfos

public static Map<String,SVNMergeRangeList> mergeMergeInfos(Map<String,SVNMergeRangeList> originalSrcsToRangeLists,
 Map<String,SVNMergeRangeList> changedSrcsToRangeLists)
                                                     throws SVNException

Throws:

SVNException

combineMergeInfoProperties

public static String combineMergeInfoProperties(String propValue1,
 String propValue2)
                                         throws SVNException

Throws:

SVNException

combineForkedMergeInfoProperties

public static String combineForkedMergeInfoProperties(String fromPropValue,
 String workingPropValue,
 String toPropValue)
                                               throws SVNException

Throws:

SVNException

diffMergeInfoProperties

public static void diffMergeInfoProperties(Map deleted,
 Map added,
 String fromPropValue,
 Map fromMergeInfo,
 String toPropValue,
 Map toMergeInfo)
                                    throws SVNException

Throws:

SVNException

diffMergeInfo

public static void diffMergeInfo(Map deleted,
 Map added,
 Map from,
 Map to,
 boolean considerInheritance)

dupCatalog

public static Map dupCatalog(Map catalog)

dupMergeInfo

public static Map dupMergeInfo(Map srcsToRangeLists,
 Map target)

isNonInheritable

public static boolean isNonInheritable(Map<String,SVNMergeRangeList> mergeInfo)

parseMergeInfo

public static Map<String,SVNMergeRangeList> parseMergeInfo(StringBuffer mergeInfo,
 Map<String,SVNMergeRangeList> srcPathsToRangeLists)
                                                    throws SVNException

Throws:

SVNException

formatMergeInfoCatalogToString

public static String formatMergeInfoCatalogToString(Map catalog,
 String keyPrefix,
 String valuePrefix)

Note: Make sure that this method is used only for making up an error message.

formatMergeInfoCatalogToString2

public static String formatMergeInfoCatalogToString2(Map<File,Map<String,SVNMergeRangeList>> catalog,
 String keyPrefix,
 String valuePrefix)

formatMergeInfoToArray

public static String[] formatMergeInfoToArray(Map srcsToRangeLists,
 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 String formatMergeInfoToString(Map srcsToRangeLists,
 String prefix)

shouldElideMergeInfo

public static boolean shouldElideMergeInfo(Map<String,SVNMergeRangeList> parentMergeInfo,
 Map<String,SVNMergeRangeList> childMergeInfo,
 String pathSuffix)

elideMergeInfo

public static void elideMergeInfo(Map parentMergeInfo,
 Map childMergeInfo,
 File path,
 String pathSuffix,
 SVNWCAccess access)
                           throws SVNException

Throws:

SVNException

mergeInfoEquals

public static boolean mergeInfoEquals(Map mergeInfo1,
 Map mergeInfo2,
 boolean considerInheritance)

findMergeSources

public static String[] findMergeSources(long revision,
 Map mergeInfo)

getInheritableMergeInfo

public static Map<String,SVNMergeRangeList> getInheritableMergeInfo(Map<String,SVNMergeRangeList> mergeInfo,
 String path,
 long startRev,
 long endRev)

getInheritableMergeInfo

public static Map<String,SVNMergeRangeList> getInheritableMergeInfo(Map<String,SVNMergeRangeList> mergeInfo,
 String path,
 long startRev,
 long endRev,
 boolean inheritable)

removeMergeInfo

public static Map removeMergeInfo(Map eraser,
 Map whiteBoard)

removeMergeInfo

public static Map<String,SVNMergeRangeList> removeMergeInfo(Map<String,SVNMergeRangeList> eraser,
 Map<String,SVNMergeRangeList> whiteBoard,
 boolean considerInheritance)

intersectMergeInfo

public static Map intersectMergeInfo(Map mergeInfo1,
 Map mergeInfo2)

intersectMergeInfo

public static Map<String,SVNMergeRangeList> intersectMergeInfo(Map mergeInfo1,
 Map mergeInfo2,
 boolean considerInheritance)

parseRevisionList

public static SVNMergeRange[] parseRevisionList(StringBuffer mergeInfo,
 String path)
                                         throws SVNException

Throws:

SVNException

appendSuffix

public static Map<String,SVNMergeRangeList> appendSuffix(Map<String,SVNMergeRangeList> mergeinfo,
 String suffix)

diffMergeRangeLists

public static SVNMergeRangeList[] diffMergeRangeLists(SVNMergeRangeList fromRangeList,
 SVNMergeRangeList toRangeList,
 boolean considerInheritance)

Returns:

[deletedList, addedList]

parseRevision

private static long parseRevision(StringBuffer mergeInfo)
                           throws SVNException

Throws:

SVNException

walkMergeInfoHashForDiff

private static void walkMergeInfoHashForDiff(Map deleted,
 Map added,
 Map from,
 Map to,
 boolean considerInheritance)