/** * Runs through all merge ranges in this object and says, whether the specified <code>revision</code> * falls between start and end revision of any of those ranges. * * @param revision revision to find in ranges * @return <span class="javakeyword">true</span> if one of the ranges in this list includes the * specified <code>revision</code> */ public boolean includes(long revision) { for (int i = 0; i < myRanges.length; i++) { SVNMergeRange range = myRanges[i]; if (revision > range.getStartRevision() && revision <= range.getEndRevision()) { return true; } } return false; }
public int compare(Object o1, Object o2) { PathListRange plr1 = (PathListRange) o1; PathListRange plr2 = (PathListRange) o2; if (plr1.myRange.getStartRevision() < plr2.myRange.getStartRevision()) { return -1; } if (plr1.myRange.getStartRevision() > plr2.myRange.getStartRevision()) { return 1; } if (plr1.myRange.getEndRevision() < plr2.myRange.getEndRevision()) { return -1; } if (plr1.myRange.getEndRevision() < plr2.myRange.getEndRevision()) { return 1; } return 0; } };
private long getMostInclusiveEndRevision(Map<File, MergePath> childrenWithMergeInfo, boolean isRollBack) { long endRev = SVNRepository.INVALID_REVISION; for (MergePath child : childrenWithMergeInfo.values()) { if (child == null || child.absent) { continue; } if (child.remainingRanges.getSize() > 0) { SVNMergeRange ranges[] = child.remainingRanges.getRanges(); SVNMergeRange range = ranges[0]; if (!SVNRevision.isValidRevisionNumber(endRev) || (isRollBack && range.getEndRevision() > endRev) || (!isRollBack && range.getEndRevision() < endRev)) { endRev = range.getEndRevision(); } } } return endRev; }
private SVNErrorMessage makeMergeConflictError(File targetPath, SVNMergeRange range) { SVNErrorMessage error = SVNErrorMessage.create(SVNErrorCode.WC_FOUND_CONFLICT, "One or more conflicts were produced while merging r{0}:{1} into\n" + "''{2}'' --\n" + "resolve all conflicts and rerun the merge to apply the remaining\n" + "unmerged revisions", new Object[] { Long.toString(range.getStartRevision()), Long.toString(range.getEndRevision()), targetPath} ); return error; }
private SVNErrorMessage makeMergeConflictError(File targetPath, SVNMergeRange range) { SVNErrorMessage error = SVNErrorMessage.create(SVNErrorCode.WC_FOUND_CONFLICT, "One or more conflicts were produced while merging r{0}:{1} into\n" + "''{2}'' --\n" + "resolve all conflicts and rerun the merge to apply the remaining\n" + "unmerged revisions", new Object[] { Long.toString(range.getStartRevision()), Long.toString(range.getEndRevision()), targetPath} ); return error; }
private SVNErrorMessage makeMergeConflictError(File targetPath, SVNMergeRange range) { SVNErrorMessage error = SVNErrorMessage.create(SVNErrorCode.WC_FOUND_CONFLICT, "One or more conflicts were produced while merging r{0}:{1} into\n" + "''{2}'' --\n" + "resolve all conflicts and rerun the merge to apply the remaining\n" + "unmerged revisions", new Object[] { Long.toString(range.getStartRevision()), Long.toString(range.getEndRevision()), targetPath} ); return error; }
private SVNErrorMessage makeMergeConflictError(File targetPath, SVNMergeRange range) { SVNErrorMessage error = SVNErrorMessage.create(SVNErrorCode.WC_FOUND_CONFLICT, "One or more conflicts were produced while merging r{0}:{1} into\n" + "''{2}'' --\n" + "resolve all conflicts and rerun the merge to apply the remaining\n" + "unmerged revisions", new Object[] { Long.toString(range.getStartRevision()), Long.toString(range.getEndRevision()), targetPath} ); return error; }
private void removeSourceGap(SVNMergeRange range, SVNMergeRangeList implicitSrcGap) { if (implicitSrcGap != null) { SVNMergeRange gapRange = implicitSrcGap.getRanges()[0]; if (range.getStartRevision() < range.getEndRevision()) { if (gapRange.getStartRevision() == range.getStartRevision()) { range.setStartRevision(gapRange.getEndRevision()); } } else { if (gapRange.getStartRevision() == range.getEndRevision()) { range.setEndRevision(gapRange.getEndRevision()); } } } }
private void removeSourceGap(SVNMergeRange range, SVNMergeRangeList implicitSrcGap) { if (implicitSrcGap != null) { SVNMergeRange gapRange = implicitSrcGap.getRanges()[0]; if (range.getStartRevision() < range.getEndRevision()) { if (gapRange.getStartRevision() == range.getStartRevision()) { range.setStartRevision(gapRange.getEndRevision()); } } else { if (gapRange.getStartRevision() == range.getEndRevision()) { range.setEndRevision(gapRange.getEndRevision()); } } } }
private void removeFirstRangeFromRemainingRanges(long endRevision, List childrenWithMergeInfo) { 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 firstRange = originalRemainingRanges[0]; if (firstRange.getEndRevision() == endRevision) { SVNMergeRange[] remainingRanges = new SVNMergeRange[originalRemainingRanges.length - 1]; System.arraycopy(originalRemainingRanges, 1, remainingRanges, 0, originalRemainingRanges.length - 1); child.myRemainingRanges = new SVNMergeRangeList(remainingRanges); } } } }
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 static RevisionRange getRevisionRange(SVNMergeRange revisionRange) { if (revisionRange == null) { return null; } long startRevision = revisionRange.getStartRevision(); long endRevision = revisionRange.getEndRevision(); return new RevisionRange(Revision.getInstance(startRevision), Revision.getInstance(endRevision)); }
public static RevisionRange createRevisionRange(SVNMergeRange range){ if (range == null){ return null; } return new RevisionRange(new Revision.Number(range.getStartRevision()), new Revision.Number(range.getEndRevision())); }
public static RevisionRange createRevisionRange(SVNMergeRange range){ if (range == null){ return null; } return new RevisionRange(new Revision.Number(range.getStartRevision()), new Revision.Number(range.getEndRevision())); }
public static RevisionRange createRevisionRange(SVNMergeRange range){ if (range == null){ return null; } return new RevisionRange(new Revision.Number(range.getStartRevision()), new Revision.Number(range.getEndRevision())); }
public static RevisionRange createRevisionRange(SVNMergeRange range){ if (range == null){ return null; } return new RevisionRange(new Revision.Number(range.getStartRevision()), new Revision.Number(range.getEndRevision())); }
public SVNMergeRangeList mergeRevision(long revision) { if (getSize() > 0 && getRanges()[getSize() - 1].getEndRevision() == revision - 1) { getRanges()[getSize() - 1].setEndRevision(revision); return this; } pushRange(revision -1 , revision, true); return this; } }