} else { leftRev[0] = youngestMergedRev[0]; leftURL[0] = deriveLocation(null, sourceReposRoot.appendPath(targetReposRelPath, false), null, SVNRevision.create(youngestMergedRev[0]), targetRepository, null);
} else { leftRev[0] = youngestMergedRev[0]; leftURL[0] = deriveLocation(null, sourceReposRoot.appendPath(targetReposRelPath, false), null, SVNRevision.create(youngestMergedRev[0]), repository, null);
protected Map[] getFullMergeInfo(SVNEntry entry, boolean getRecorded, boolean getImplicit, boolean[] indirect, SVNMergeInfoInheritance inherit, SVNRepository repos, File target, long start, long end) throws SVNException { Map[] result = new Map[2]; SVNErrorManager.assertionFailure(SVNRevision.isValidRevisionNumber(start) && SVNRevision.isValidRevisionNumber(end) && start > end, null, SVNLogType.WC); //get recorded merge info if (getRecorded) { result[0] = getWCOrRepositoryMergeInfo(target, entry, inherit, indirect, false, repos); } if (getImplicit) { long[] targetRev = new long[1]; targetRev[0] = SVNRepository.INVALID_REVISION; SVNURL url = deriveLocation(target, null, targetRev, SVNRevision.WORKING, repos, myWCAccess); if (targetRev[0] <= end) { result[1] = new TreeMap(); return result; } Map implicitMergeInfo = calculateImplicitMergeInfo(repos, url, targetRev, start, end); if (implicitMergeInfo != null) { result[1] = implicitMergeInfo; } } return result; }
} else { leftRev[0] = youngestMergedRev[0]; leftURL[0] = deriveLocation(null, sourceReposRoot.appendPath(targetReposRelPath, false), null, SVNRevision.create(youngestMergedRev[0]), repository, null);
protected Map[] getFullMergeInfo(SVNEntry entry, boolean[] indirect, SVNMergeInfoInheritance inherit, SVNRepository repos, File target, long start, long end) throws SVNException { Map[] result = new Map[2]; if (!SVNRevision.isValidRevisionNumber(start) || !SVNRevision.isValidRevisionNumber(end) || start <= end) { SVNErrorMessage err = SVNErrorMessage.create(SVNErrorCode.UNKNOWN, "ASSERTION FAILED in SVNMergeDriver.getFullMergeInfo()"); SVNErrorManager.error(err, SVNLogType.DEFAULT); } //get recorded merge info result[0] = getWCOrRepositoryMergeInfo(target, entry, inherit, indirect, false, repos); long[] targetRev = new long[1]; targetRev[0] = SVNRepository.INVALID_REVISION; SVNURL url = deriveLocation(target, null, targetRev, SVNRevision.WORKING, repos, myWCAccess); if (targetRev[0] <= end) { result[1] = new TreeMap();//implicit merge info return result; } Map implicitMergeInfo = calculateImplicitMergeInfo(repos, url, targetRev, start, end); if (implicitMergeInfo != null) { result[1] = implicitMergeInfo; } return result; }
public Map getHistoryAsMergeInfo(SVNURL url, File path, SVNRevision pegRevision, long rangeYoungest, long rangeOldest, SVNRepository repos, SVNWCAccess access) throws SVNException { long[] pegRevNum = new long[1]; pegRevNum[0] = SVNRepository.INVALID_REVISION; url = deriveLocation(path, url, pegRevNum, pegRevision, repos, access); boolean closeSession = false; try { if (repos == null) { repos = createRepository(url, null, null, false); closeSession = true; } if (!SVNRevision.isValidRevisionNumber(rangeYoungest)) { rangeYoungest = pegRevNum[0]; } if (!SVNRevision.isValidRevisionNumber(rangeOldest)) { rangeOldest = 0; } Collection segments = repos.getLocationSegments("", pegRevNum[0], rangeYoungest, rangeOldest); return getMergeInfoFromSegments(segments); } finally { if (closeSession) { repos.closeSession(); } } }
protected Map getHistoryAsMergeInfo(SVNURL url, File path, SVNRevision pegRevision, long rangeYoungest, long rangeOldest, SVNRepository repos, SVNWCAccess access) throws SVNException { long[] pegRevNum = new long[1]; pegRevNum[0] = SVNRepository.INVALID_REVISION; url = deriveLocation(path, url, pegRevNum, pegRevision, repos, access); boolean closeSession = false; try { if (repos == null) { repos = createRepository(url, null, null, false); closeSession = true; } if (!SVNRevision.isValidRevisionNumber(rangeYoungest)) { rangeYoungest = pegRevNum[0]; } if (!SVNRevision.isValidRevisionNumber(rangeOldest)) { rangeOldest = 0; } Collection segments = repos.getLocationSegments("", pegRevNum[0], rangeYoungest, rangeOldest); return getMergeInfoFromSegments(segments); } finally { if (closeSession) { repos.closeSession(); } } }
public Map getHistoryAsMergeInfo(SVNURL url, File path, SVNRevision pegRevision, long rangeYoungest, long rangeOldest, SVNRepository repos, SVNWCAccess access) throws SVNException { long[] pegRevNum = new long[1]; pegRevNum[0] = SVNRepository.INVALID_REVISION; url = deriveLocation(path, url, pegRevNum, pegRevision, repos, access); boolean closeSession = false; try { if (repos == null) { repos = createRepository(url, null, null, false); closeSession = true; } if (!SVNRevision.isValidRevisionNumber(rangeYoungest)) { rangeYoungest = pegRevNum[0]; } if (!SVNRevision.isValidRevisionNumber(rangeOldest)) { rangeOldest = 0; } Collection segments = repos.getLocationSegments("", pegRevNum[0], rangeYoungest, rangeOldest); return getMergeInfoFromSegments(segments); } finally { if (closeSession) { repos.closeSession(); } } }
long[] targetRev = new long[1]; targetRev[0] = SVNRepository.INVALID_REVISION; SVNURL url = deriveLocation(target, null, targetRev, SVNRevision.WORKING, repos, myWCAccess); if (targetRev[0] <= end) { result[1] = new TreeMap();//implicit merge info