public static Map dupMergeInfo(Map srcsToRangeLists, Map target) { if (srcsToRangeLists == null) { return null; } target = target == null ? new TreeMap() : target; for (Iterator paths = srcsToRangeLists.keySet().iterator(); paths.hasNext();) { String path = (String) paths.next(); SVNMergeRangeList rangeList = (SVNMergeRangeList) srcsToRangeLists.get(path); target.put(path, rangeList.dup()); } return target; }
public static Map dupMergeInfo(Map srcsToRangeLists, Map target) { if (srcsToRangeLists == null) { return null; } target = target == null ? new TreeMap() : target; for (Iterator paths = srcsToRangeLists.keySet().iterator(); paths.hasNext();) { String path = (String) paths.next(); SVNMergeRangeList rangeList = (SVNMergeRangeList) srcsToRangeLists.get(path); target.put(path, rangeList.dup()); } return target; }
public static Map dupMergeInfo(Map srcsToRangeLists, Map target) { if (srcsToRangeLists == null) { return null; } target = target == null ? new TreeMap() : target; for (Iterator paths = srcsToRangeLists.keySet().iterator(); paths.hasNext();) { String path = (String) paths.next(); SVNMergeRangeList rangeList = (SVNMergeRangeList) srcsToRangeLists.get(path); target.put(path, rangeList.dup()); } return target; }
private Map appendToMergedFroms(Map mergeInfo, String pathComponent) { Map result = new TreeMap(); for (Iterator pathsIter = mergeInfo.keySet().iterator(); pathsIter.hasNext();) { String path = (String) pathsIter.next(); SVNMergeRangeList rangeList = (SVNMergeRangeList) mergeInfo.get(path); result.put(SVNPathUtil.append(path, pathComponent), rangeList.dup()); } return result; }
private Map appendToMergedFroms(Map mergeInfo, String pathComponent) { Map result = new TreeMap(); for (Iterator pathsIter = mergeInfo.keySet().iterator(); pathsIter.hasNext();) { String path = (String) pathsIter.next(); SVNMergeRangeList rangeList = (SVNMergeRangeList) mergeInfo.get(path); result.put(SVNPathUtil.append(path, pathComponent), rangeList.dup()); } return result; }
private Map appendToMergedFroms(Map mergeInfo, String pathComponent) { Map result = new TreeMap(); for (Iterator pathsIter = mergeInfo.keySet().iterator(); pathsIter.hasNext();) { String path = (String) pathsIter.next(); SVNMergeRangeList rangeList = (SVNMergeRangeList) mergeInfo.get(path); result.put(SVNPathUtil.append(path, pathComponent), rangeList.dup()); } return result; }
public static Map<String, SVNMergeRangeList> intersectMergeInfo(Map mergeInfo1, Map mergeInfo2, boolean considerInheritance) { Map<String, SVNMergeRangeList> mergeInfo = new TreeMap<String, SVNMergeRangeList>(); for (Iterator pathsIter = mergeInfo1.keySet().iterator(); pathsIter.hasNext();) { String path = (String) pathsIter.next(); SVNMergeRangeList rangeList1 = (SVNMergeRangeList) mergeInfo1.get(path); SVNMergeRangeList rangeList2 = (SVNMergeRangeList) mergeInfo2.get(path); if (rangeList2 != null) { rangeList2 = rangeList2.intersect(rangeList1, considerInheritance); if (!rangeList2.isEmpty()) { mergeInfo.put(path, rangeList2.dup()); } } } return mergeInfo; }
public static Map intersectMergeInfo(Map mergeInfo1, Map mergeInfo2, boolean considerInheritance) { Map mergeInfo = new TreeMap(); for (Iterator pathsIter = mergeInfo1.keySet().iterator(); pathsIter.hasNext();) { String path = (String) pathsIter.next(); SVNMergeRangeList rangeList1 = (SVNMergeRangeList) mergeInfo1.get(path); SVNMergeRangeList rangeList2 = (SVNMergeRangeList) mergeInfo2.get(path); if (rangeList2 != null) { rangeList2 = rangeList2.intersect(rangeList1, considerInheritance); if (!rangeList2.isEmpty()) { mergeInfo.put(path, rangeList2.dup()); } } } return mergeInfo; }
public static Map intersectMergeInfo(Map mergeInfo1, Map mergeInfo2, boolean considerInheritance) { Map mergeInfo = new TreeMap(); for (Iterator pathsIter = mergeInfo1.keySet().iterator(); pathsIter.hasNext();) { String path = (String) pathsIter.next(); SVNMergeRangeList rangeList1 = (SVNMergeRangeList) mergeInfo1.get(path); SVNMergeRangeList rangeList2 = (SVNMergeRangeList) mergeInfo2.get(path); if (rangeList2 != null) { rangeList2 = rangeList2.intersect(rangeList1, considerInheritance); if (!rangeList2.isEmpty()) { mergeInfo.put(path, rangeList2.dup()); } } } return mergeInfo; }
public static Map getInheritableMergeInfo(Map mergeInfo, String path, long startRev, long endRev) { Map inheritableMergeInfo = new TreeMap(); if (mergeInfo != null) { for (Iterator paths = mergeInfo.keySet().iterator(); paths.hasNext();) { String mergeSrcPath = (String) paths.next(); SVNMergeRangeList rangeList = (SVNMergeRangeList) mergeInfo.get(mergeSrcPath); SVNMergeRangeList inheritableRangeList = null; if (path == null || path.equals(mergeSrcPath)) { inheritableRangeList = rangeList.getInheritableRangeList(startRev, endRev); } else { inheritableRangeList = rangeList.dup(); } if (!inheritableRangeList.isEmpty()) { inheritableMergeInfo.put(mergeSrcPath, inheritableRangeList); } } } return inheritableMergeInfo; }
public static Map<String, SVNMergeRangeList> getInheritableMergeInfo(Map<String, SVNMergeRangeList> mergeInfo, String path, long startRev, long endRev, boolean inheritable) { Map<String, SVNMergeRangeList> inheritableMergeInfo = new TreeMap<String, SVNMergeRangeList>(); if (mergeInfo != null) { for (Iterator<String> paths = mergeInfo.keySet().iterator(); paths.hasNext();) { String mergeSrcPath = (String) paths.next(); SVNMergeRangeList rangeList = (SVNMergeRangeList) mergeInfo.get(mergeSrcPath); SVNMergeRangeList inheritableRangeList = null; if (path == null || path.equals(mergeSrcPath)) { inheritableRangeList = rangeList.getInheritableRangeList(startRev, endRev, inheritable); } else { inheritableRangeList = rangeList.dup(); } if (!inheritableRangeList.isEmpty()) { inheritableMergeInfo.put(mergeSrcPath, inheritableRangeList); } } } return inheritableMergeInfo; }
public static Map getInheritableMergeInfo(Map mergeInfo, String path, long startRev, long endRev) { Map inheritableMergeInfo = new TreeMap(); if (mergeInfo != null) { for (Iterator paths = mergeInfo.keySet().iterator(); paths.hasNext();) { String mergeSrcPath = (String) paths.next(); SVNMergeRangeList rangeList = (SVNMergeRangeList) mergeInfo.get(mergeSrcPath); SVNMergeRangeList inheritableRangeList = null; if (path == null || path.equals(mergeSrcPath)) { inheritableRangeList = rangeList.getInheritableRangeList(startRev, endRev); } else { inheritableRangeList = rangeList.dup(); } if (!inheritableRangeList.isEmpty()) { inheritableMergeInfo.put(mergeSrcPath, inheritableRangeList); } } } return inheritableMergeInfo; }
if ((childEntry.isDirectory() && mergedPath.equals(myTarget) && depth == SVNDepth.IMMEDIATES) || (childEntry.isFile() && depth == SVNDepth.FILES)) { childRangeList = rangeList.dup(); SVNMergeRange[] childMergeRanges = childRangeList.getRanges(); for (int i = 0; i < childRangeList.getSize(); i++) {
int parentIndex = findNearestAncestor(myChildrenWithMergeInfo.toArray(), false, pathWithNewMergeInfo); MergePath parent = (MergePath) myChildrenWithMergeInfo.get(parentIndex); newChild.myRemainingRanges = parent.myRemainingRanges.dup(); myChildrenWithMergeInfo.add(newChild); Collections.sort(myChildrenWithMergeInfo);
int parentIndex = findNearestAncestor(myChildrenWithMergeInfo.toArray(), false, pathWithNewMergeInfo); MergePath parent = (MergePath) myChildrenWithMergeInfo.get(parentIndex); newChild.myRemainingRanges = parent.myRemainingRanges.dup(); myChildrenWithMergeInfo.add(newChild); Collections.sort(myChildrenWithMergeInfo);
int parentIndex = findNearestAncestor(myChildrenWithMergeInfo.toArray(), false, pathWithNewMergeInfo); MergePath parent = (MergePath) myChildrenWithMergeInfo.get(parentIndex); newChild.myRemainingRanges = parent.myRemainingRanges.dup(); myChildrenWithMergeInfo.add(newChild); Collections.sort(myChildrenWithMergeInfo);
int parentIndex = findNearestAncestor(childrenWithMergeInfoArray, false, pathWithNewMergeInfo); MergePath parent = (MergePath) childrenWithMergeInfoArray[parentIndex]; newChild.remainingRanges = parent.remainingRanges.dup(); childrenWithMergeInfo.put(newChild.absPath, newChild);