/** * 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; } };
/** * 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; }
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 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())); }
protected void getLogsForMergeInfoRangeList(SVNURL reposRootURL, String[] paths, SVNMergeRangeList rangeList, boolean discoverChangedPaths, String[] revProps, ISVNLogEntryHandler handler) throws SVNException { if (rangeList.isEmpty()) { return; } SVNMergeRange[] listRanges = rangeList.getRanges(); Arrays.sort(listRanges); SVNMergeRange youngestRange = listRanges[listRanges.length - 1]; SVNRevision youngestRev = SVNRevision.create(youngestRange.getEndRevision()); SVNMergeRange oldestRange = listRanges[0]; SVNRevision oldestRev = SVNRevision.create(oldestRange.getStartRevision()); LogHandlerFilter filterHandler = new LogHandlerFilter(handler, rangeList); SVNLogClient16 logClient = getLogClient(); logClient.doLog(reposRootURL, paths, youngestRev, oldestRev, youngestRev, false, discoverChangedPaths, false, 0, revProps, filterHandler); checkCancelled(); }
protected void getLogsForMergeInfoRangeList(SVNURL reposRootURL, String[] paths, SVNMergeRangeList rangeList, boolean discoverChangedPaths, String[] revProps, ISVNLogEntryHandler handler) throws SVNException { if (rangeList.isEmpty()) { return; } SVNMergeRange[] listRanges = rangeList.getRanges(); Arrays.sort(listRanges); SVNMergeRange youngestRange = listRanges[listRanges.length - 1]; SVNRevision youngestRev = SVNRevision.create(youngestRange.getEndRevision()); SVNMergeRange oldestRange = listRanges[0]; SVNRevision oldestRev = SVNRevision.create(oldestRange.getStartRevision()); LogHandlerFilter filterHandler = new LogHandlerFilter(handler, rangeList); SVNLogClient logClient = getLogClient(); logClient.doLog(reposRootURL, paths, youngestRev, oldestRev, youngestRev, false, discoverChangedPaths, false, 0, revProps, filterHandler); checkCancelled(); }