/** * @return [deletedList, addedList] */ public static SVNMergeRangeList[] diffMergeRangeLists(SVNMergeRangeList fromRangeList, SVNMergeRangeList toRangeList, boolean considerInheritance) { SVNMergeRangeList deletedRangeList = fromRangeList.diff(toRangeList, considerInheritance); SVNMergeRangeList addedRangeList = toRangeList.diff(fromRangeList, considerInheritance); return new SVNMergeRangeList[] { deletedRangeList, addedRangeList }; }
/** * @return [deletedList, addedList] */ public static SVNMergeRangeList[] diffMergeRangeLists(SVNMergeRangeList fromRangeList, SVNMergeRangeList toRangeList, boolean considerInheritance) { SVNMergeRangeList deletedRangeList = fromRangeList.diff(toRangeList, considerInheritance); SVNMergeRangeList addedRangeList = toRangeList.diff(fromRangeList, considerInheritance); return new SVNMergeRangeList[] { deletedRangeList, addedRangeList }; }
/** * @return [deletedList, addedList] */ public static SVNMergeRangeList[] diffMergeRangeLists(SVNMergeRangeList fromRangeList, SVNMergeRangeList toRangeList, boolean considerInheritance) { SVNMergeRangeList deletedRangeList = fromRangeList.diff(toRangeList, considerInheritance); SVNMergeRangeList addedRangeList = toRangeList.diff(fromRangeList, considerInheritance); return new SVNMergeRangeList[] { deletedRangeList, addedRangeList }; }
private SVNMergeRangeList filterNaturalHistoryFromMergeInfo(String srcPath, Map<String, SVNMergeRangeList> implicitMergeInfo, SVNMergeRange requestedRange) { SVNMergeRangeList requestedRangeList = new SVNMergeRangeList(requestedRange.dup()); SVNMergeRangeList filteredRangeList = null; if (implicitMergeInfo != null && requestedRange.getStartRevision() < requestedRange.getEndRevision()) { SVNMergeRangeList impliedRangeList = (SVNMergeRangeList) implicitMergeInfo.get(srcPath); if (impliedRangeList != null) { filteredRangeList = requestedRangeList.diff(impliedRangeList, false); } } if (filteredRangeList == null) { filteredRangeList = requestedRangeList; } return filteredRangeList; }
private SVNMergeRangeList filterNaturalHistoryFromMergeInfo(String srcPath, Map implicitMergeInfo, SVNMergeRange requestedRange) { SVNMergeRangeList requestedRangeList = new SVNMergeRangeList(requestedRange.dup()); SVNMergeRangeList filteredRangeList = null; if (implicitMergeInfo != null && requestedRange.getStartRevision() < requestedRange.getEndRevision()) { SVNMergeRangeList impliedRangeList = (SVNMergeRangeList) implicitMergeInfo.get(srcPath); if (impliedRangeList != null) { filteredRangeList = requestedRangeList.diff(impliedRangeList, false); } } if (filteredRangeList == null) { filteredRangeList = requestedRangeList; } return filteredRangeList; }
private SVNMergeRangeList filterNaturalHistoryFromMergeInfo(String srcPath, Map implicitMergeInfo, SVNMergeRange requestedRange) { SVNMergeRangeList requestedRangeList = new SVNMergeRangeList(requestedRange.dup()); SVNMergeRangeList filteredRangeList = null; if (implicitMergeInfo != null && requestedRange.getStartRevision() < requestedRange.getEndRevision()) { SVNMergeRangeList impliedRangeList = (SVNMergeRangeList) implicitMergeInfo.get(srcPath); if (impliedRangeList != null) { filteredRangeList = requestedRangeList.diff(impliedRangeList, false); } } if (filteredRangeList == null) { filteredRangeList = requestedRangeList; } return filteredRangeList; }
private SVNMergeRangeList filterNaturalHistoryFromMergeInfo(String srcPath, Map implicitMergeInfo, SVNMergeRange requestedRange) { SVNMergeRangeList requestedRangeList = new SVNMergeRangeList(requestedRange.dup()); SVNMergeRangeList filteredRangeList = null; if (implicitMergeInfo != null && requestedRange.getStartRevision() < requestedRange.getEndRevision()) { SVNMergeRangeList impliedRangeList = (SVNMergeRangeList) implicitMergeInfo.get(srcPath); if (impliedRangeList != null) { filteredRangeList = requestedRangeList.diff(impliedRangeList, false); } } if (filteredRangeList == null) { filteredRangeList = requestedRangeList; } return filteredRangeList; }
private void fixDeletedSubtreeRanges(SVNURL url1, long revision1, SVNURL url2, long revision2, SVNRepository repository) throws SVNException { boolean isRollback = revision2 < revision1; SVNURL sourceRootUrl = repository.getRepositoryRoot(true); Object[] array= myChildrenWithMergeInfo.toArray(); for (Iterator iterator = myChildrenWithMergeInfo.iterator(); iterator.hasNext(); ) { MergePath child = (MergePath) iterator.next(); if (child.myIsAbsent) { continue; } int parentIndex = findNearestAncestor(array, false, child.myPath); MergePath parent = (MergePath) array[parentIndex]; if (isRollback) { child.myRemainingRanges = child.myRemainingRanges.reverse(); parent.myRemainingRanges = parent.myRemainingRanges.reverse(); } SVNMergeRangeList added = child.myRemainingRanges.diff(parent.myRemainingRanges, true); SVNMergeRangeList deleted = parent.myRemainingRanges.diff(child.myRemainingRanges, true); if (isRollback) { child.myRemainingRanges = child.myRemainingRanges.reverse(); parent.myRemainingRanges = parent.myRemainingRanges.reverse(); } if (!added.isEmpty() || !deleted.isEmpty()) { String childReposSrcPath = SVNWCUtils.getPathAsChild(myTarget, child.myPath); SVNURL childPrimarySrcUrl = revision1 < revision2 ? url2 : url1; childPrimarySrcUrl = childPrimarySrcUrl.appendPath(childReposSrcPath, false); adjustDeletedSubTreeRanges(child, parent, revision1, revision2, childPrimarySrcUrl, repository); } } }
public SVNMergeRangeList getInheritableRangeList(long startRev, long endRev, boolean inheritable) { LinkedList inheritableRanges = new LinkedList(); if (myRanges.length > 0) { if (!SVNRevision.isValidRevisionNumber(startRev) || !SVNRevision.isValidRevisionNumber(endRev) || endRev < startRev) { for (int i = 0; i < myRanges.length; i++) { SVNMergeRange range = myRanges[i]; if (range.isInheritable() == inheritable) { SVNMergeRange inheritableRange = new SVNMergeRange(range.getStartRevision(), range.getEndRevision(), true); inheritableRanges.add(inheritableRange); } } } else { SVNMergeRange range = new SVNMergeRange(startRev, endRev, false); SVNMergeRangeList boundRangeList = new SVNMergeRangeList(range); return diff(boundRangeList, true); } } SVNMergeRange[] ranges = (SVNMergeRange[]) inheritableRanges.toArray(new SVNMergeRange[inheritableRanges.size()]); return new SVNMergeRangeList(ranges); }
SVNMergeRangeList beforeMergeRangeList = before.get(source); if (beforeMergeRangeList != null) { SVNMergeRangeList changeRangeList = afterMergeRangeList.diff(beforeMergeRangeList, false); if (!changeRangeList.isEmpty()) { change.put(source, changeRangeList);
implicitMergeRangeList = implicitMergeRangeList != null ? implicitMergeRangeList.merge(rangelist) : rangelist; SVNMergeRangeList gapRangeList = requestedMergeRangeList.diff(implicitMergeRangeList, false); if (gapRangeList.getSize() > 0) { gap[0] = gapRangeList.getRanges()[0].getStartRevision();
implicitMergeRangeList = implicitMergeRangeList != null ? implicitMergeRangeList.merge(rangelist) : rangelist; SVNMergeRangeList gapRangeList = requestedMergeRangeList.diff(implicitMergeRangeList, false); if (gapRangeList.getSize() > 0) { gap[0] = gapRangeList.getRanges()[0].getStartRevision();
implicitMergeRangeList = implicitMergeRangeList != null ? implicitMergeRangeList.merge(rangelist) : rangelist; SVNMergeRangeList gapRangeList = requestedMergeRangeList.diff(implicitMergeRangeList, false); if (gapRangeList.getSize() > 0) { gap[0] = gapRangeList.getRanges()[0].getStartRevision();
ranges = ranges.dup(); ranges = ranges.reverse(); rangeList = rangeList.diff(ranges, false); } else { rangeList = rangeList.merge(ranges);
SVNMergeRange range = new SVNMergeRange(startRev, endRev, false); SVNMergeRangeList boundRangeList = new SVNMergeRangeList(range); return diff(boundRangeList, true);
childMergeRangeList.reverse(); childMergeRangeList = childMergeRangeList.diff(myImplicitSrcGap, false); if (isRollBack) { childMergeRangeList.reverse();
SVNMergeRange range = new SVNMergeRange(startRev, endRev, false); SVNMergeRangeList boundRangeList = new SVNMergeRangeList(range); return diff(boundRangeList, true);
child.myRemainingRanges = requestedRangeList.diff(targetRangeList, false); } else { child.myRemainingRanges = new SVNMergeRangeList(new SVNMergeRange(rev1, rev2, true));
child.myRemainingRanges = requestedRangeList.diff(targetRangeList, false); } else { child.myRemainingRanges = new SVNMergeRangeList(new SVNMergeRange(rev1, rev2, true));