/** * Return a string representation of this object. * @return this object as a string */ public String toString() { String output = ""; if (myStartRevision == myEndRevision - 1) { output += String.valueOf(myEndRevision); } else { output += String.valueOf(myStartRevision + 1) + "-" + String.valueOf(myEndRevision); } if (!isInheritable()) { output += SVNMergeRangeList.MERGE_INFO_NONINHERITABLE_STRING; } return output; }
/** * Return a string representation of this object. * @return this object as a string */ public String toString() { String output = ""; if (myStartRevision == myEndRevision - 1) { output += String.valueOf(myEndRevision); } else { output += String.valueOf(myStartRevision + 1) + "-" + String.valueOf(myEndRevision); } if (!isInheritable()) { output += SVNMergeRangeList.MERGE_INFO_NONINHERITABLE_STRING; } return output; }
/** * Return a string representation of this object. * @return this object as a string */ public String toString() { String output = ""; if (myStartRevision == myEndRevision - 1) { output += String.valueOf(myEndRevision); } else { output += String.valueOf(myStartRevision + 1) + "-" + String.valueOf(myEndRevision); } if (!isInheritable()) { output += SVNMergeRangeList.MERGE_INFO_NONINHERITABLE_STRING; } return output; }
public static boolean isNonInheritable(Map<String, SVNMergeRangeList> mergeInfo) { if (mergeInfo != null) { for (String path : mergeInfo.keySet()) { SVNMergeRangeList rangeList = mergeInfo.get(path); SVNMergeRange[] ranges = rangeList.getRanges(); for (int i = 0; ranges != null && i < ranges.length; i++) { if (ranges[i] != null && !ranges[i].isInheritable()) { return true; } } } } return false; }
private void sliceRemainingRanges(List childrenWithMergeInfo, boolean isRollBack, long endRevision) { for (Iterator children = childrenWithMergeInfo.iterator(); children.hasNext();) { MergePath child = (MergePath) children.next(); if (child == null || child.myIsAbsent) { continue; } if (!child.myRemainingRanges.isEmpty()) { SVNMergeRange[] originalRemainingRanges = child.myRemainingRanges.getRanges(); SVNMergeRange range = originalRemainingRanges[0]; if ((isRollBack && range.getStartRevision() > endRevision && range.getEndRevision() < endRevision) || (!isRollBack && range.getStartRevision() < endRevision && range.getEndRevision() > endRevision)) { SVNMergeRange splitRange1 = new SVNMergeRange(range.getStartRevision(), endRevision, range.isInheritable()); SVNMergeRange splitRange2 = new SVNMergeRange(endRevision, range.getEndRevision(), range.isInheritable()); SVNMergeRange[] remainingRanges = new SVNMergeRange[originalRemainingRanges.length + 1]; remainingRanges[0] = splitRange1; remainingRanges[1] = splitRange2; System.arraycopy(originalRemainingRanges, 1, remainingRanges, 2, originalRemainingRanges.length - 1); child.myRemainingRanges = new SVNMergeRangeList(remainingRanges); } } } }
private void sliceRemainingRanges(List childrenWithMergeInfo, boolean isRollBack, long endRevision) { for (Iterator children = childrenWithMergeInfo.iterator(); children.hasNext();) { MergePath child = (MergePath) children.next(); if (child == null || child.myIsAbsent) { continue; } if (!child.myRemainingRanges.isEmpty()) { SVNMergeRange[] originalRemainingRanges = child.myRemainingRanges.getRanges(); SVNMergeRange range = originalRemainingRanges[0]; if ((isRollBack && range.getStartRevision() > endRevision && range.getEndRevision() < endRevision) || (!isRollBack && range.getStartRevision() < endRevision && range.getEndRevision() > endRevision)) { SVNMergeRange splitRange1 = new SVNMergeRange(range.getStartRevision(), endRevision, range.isInheritable()); SVNMergeRange splitRange2 = new SVNMergeRange(endRevision, range.getEndRevision(), range.isInheritable()); SVNMergeRange[] remainingRanges = new SVNMergeRange[originalRemainingRanges.length + 1]; remainingRanges[0] = splitRange1; remainingRanges[1] = splitRange2; System.arraycopy(originalRemainingRanges, 1, remainingRanges, 2, originalRemainingRanges.length - 1); child.myRemainingRanges = new SVNMergeRangeList(remainingRanges); } } } }
private void sliceRemainingRanges(List childrenWithMergeInfo, boolean isRollBack, long endRevision) { for (Iterator children = childrenWithMergeInfo.iterator(); children.hasNext();) { MergePath child = (MergePath) children.next(); if (child == null || child.myIsAbsent) { continue; } if (!child.myRemainingRanges.isEmpty()) { SVNMergeRange[] originalRemainingRanges = child.myRemainingRanges.getRanges(); SVNMergeRange range = originalRemainingRanges[0]; if ((isRollBack && range.getStartRevision() > endRevision && range.getEndRevision() < endRevision) || (!isRollBack && range.getStartRevision() < endRevision && range.getEndRevision() > endRevision)) { SVNMergeRange splitRange1 = new SVNMergeRange(range.getStartRevision(), endRevision, range.isInheritable()); SVNMergeRange splitRange2 = new SVNMergeRange(endRevision, range.getEndRevision(), range.isInheritable()); SVNMergeRange[] remainingRanges = new SVNMergeRange[originalRemainingRanges.length + 1]; remainingRanges[0] = splitRange1; remainingRanges[1] = splitRange2; System.arraycopy(originalRemainingRanges, 1, remainingRanges, 2, originalRemainingRanges.length - 1); child.myRemainingRanges = new SVNMergeRangeList(remainingRanges); } } } }
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); }
range.isInheritable() != lastRange.isInheritable()) { if (lastRange.isInheritable() == range.isInheritable()) { lastRange.setEndRevision(Math.max(range.getEndRevision(), lastRange.getEndRevision())); continue;
range.isInheritable() != lastRange.isInheritable()) { if (lastRange.isInheritable() == range.isInheritable()) { lastRange.setEndRevision(Math.max(range.getEndRevision(), lastRange.getEndRevision())); continue;
private void sliceRemainingRanges(Map<File, MergePath> childrenWithMergeInfo, boolean isRollBack, long endRevision) { for (MergePath child: childrenWithMergeInfo.values()) { if (child == null || child.absent) { continue; } if (!child.remainingRanges.isEmpty()) { SVNMergeRange[] originalRemainingRanges = child.remainingRanges.getRanges(); SVNMergeRange range = originalRemainingRanges[0]; if ((isRollBack && range.getStartRevision() > endRevision && range.getEndRevision() < endRevision) || (!isRollBack && range.getStartRevision() < endRevision && range.getEndRevision() > endRevision)) { SVNMergeRange splitRange1 = new SVNMergeRange(range.getStartRevision(), endRevision, range.isInheritable()); SVNMergeRange splitRange2 = new SVNMergeRange(endRevision, range.getEndRevision(), range.isInheritable()); SVNMergeRange[] remainingRanges = new SVNMergeRange[originalRemainingRanges.length + 1]; remainingRanges[0] = splitRange1; remainingRanges[1] = splitRange2; System.arraycopy(originalRemainingRanges, 1, remainingRanges, 2, originalRemainingRanges.length - 1); child.remainingRanges = new SVNMergeRangeList(remainingRanges); } } } }
for (int i = 0; i < myRanges.length; i++) { SVNMergeRange range = myRanges[i]; if (range.isInheritable()) { SVNMergeRange inheritableRange = new SVNMergeRange(range.getStartRevision(), range.getEndRevision(),
range.setEndRevision(revision); youngerRangeList.pushRange(youngerRange.getStartRevision(), youngerRange.getEndRevision(), youngerRange.isInheritable());
for (int i = 0; i < myRanges.length; i++) { SVNMergeRange range = myRanges[i]; if (range.isInheritable()) { SVNMergeRange inheritableRange = new SVNMergeRange(range.getStartRevision(), range.getEndRevision(),
int res = range1.compareTo(range2); if (res == 0) { if (range1.isInheritable() || range2.isInheritable()) { range1.setInheritable(true);
r.setEndRevision(revision); youngerRl.pushRange(youngerRange.getStartRevision(), youngerRange.getEndRevision(), youngerRange.isInheritable());
int res = range1.compareTo(range2); if (res == 0) { if (range1.isInheritable() || range2.isInheritable()) { range1.setInheritable(true);
int res = range1.compareTo(range2); if (res == 0) { if (range1.isInheritable() || range2.isInheritable()) { range1.setInheritable(true);
if (remove) { tmpRange = new SVNMergeRange(range1.getStartRevision(), range2.getStartRevision(), range1.isInheritable()); } else { tmpRange = new SVNMergeRange(range2.getStartRevision(), Math.min(range1.getEndRevision(), range2.getEndRevision()), range1.isInheritable()); if (!remove) { SVNMergeRange tmpRange = new SVNMergeRange(Math.max(range1.getStartRevision(), range2.getStartRevision()), range2.getEndRevision(), range1.isInheritable()); lastRange = combineWithLastRange(ranges, lastRange, tmpRange, true, considerInheritance);
if (remove) { tmpRange = new SVNMergeRange(range1.getStartRevision(), range2.getStartRevision(), range1.isInheritable()); } else { tmpRange = new SVNMergeRange(range2.getStartRevision(), Math.min(range1.getEndRevision(), range2.getEndRevision()), range1.isInheritable()); if (!remove) { SVNMergeRange tmpRange = new SVNMergeRange(Math.max(range1.getStartRevision(), range2.getStartRevision()), range2.getEndRevision(), range1.isInheritable()); lastRange = combineWithLastRange(ranges, lastRange, tmpRange, true, considerInheritance);