protected SVNRepository ensureRepository(SVNRepository repository, SVNURL url) throws SVNException { if (repository != null) { try { ensureSessionURL(repository, url); return repository; } catch (SVNException e) { // } repository = null; } if (repository == null) { repository = createRepository(url, null, null, false); } return repository; }
protected SVNRepository ensureRepository(SVNRepository repository, SVNURL url) throws SVNException { if (repository != null) { try { ensureSessionURL(repository, url); return repository; } catch (SVNException e) { // } repository = null; } if (repository == null) { repository = createRepository(url, null, null, false); } return repository; }
protected SVNRepository ensureRepository(SVNRepository repository, SVNURL url) throws SVNException { if (repository != null) { try { ensureSessionURL(repository, url); return repository; } catch (SVNException e) { // } repository = null; } if (repository == null) { repository = createRepository(url, null, null, false); } return repository; }
oldURL = ensureSessionURL(myRepository2, pathEntry.getSVNURL()); Map pathInheritedMergeInfo = getWCOrRepositoryMergeInfo(pathWithNewMergeInfo, pathEntry, SVNMergeInfoInheritance.NEAREST_ANCESTOR, indirect, false, myRepository2);
oldURL = ensureSessionURL(myRepository2, pathEntry.getSVNURL()); Map pathInheritedMergeInfo = getWCOrRepositoryMergeInfo(pathWithNewMergeInfo, pathEntry, SVNMergeInfoInheritance.NEAREST_ANCESTOR, indirect, false, myRepository2);
oldURL = ensureSessionURL(myRepository2, pathEntry.getSVNURL()); Map pathInheritedMergeInfo = getWCOrRepositoryMergeInfo(pathWithNewMergeInfo, pathEntry, SVNMergeInfoInheritance.NEAREST_ANCESTOR, indirect, false, myRepository2);
oldURL = ensureSessionURL(repos, url);
oldURL = ensureSessionURL(repos, url);
SVNURL mergeSourceRootURL = myRepository2.getRepositoryRoot(true); SVNURL targetURL = getURL(path); SVNURL oldURL = ensureSessionURL(myRepository2, targetURL);
SVNURL mergeSourceRootURL = myRepository2.getRepositoryRoot(true); SVNURL targetURL = getURL(path); SVNURL oldURL = ensureSessionURL(myRepository2, targetURL);
SVNURL mergeSourceRootURL = myRepository2.getRepositoryRoot(true); SVNURL targetURL = getURL(path); SVNURL oldURL = ensureSessionURL(myRepository2, targetURL);
public Map calculateImplicitMergeInfo(SVNRepository repos, SVNURL url, long[] targetRev, long start, long end) throws SVNException { Map implicitMergeInfo = null; boolean closeSession = false; SVNURL sessionURL = null; try { if (repos != null) { sessionURL = ensureSessionURL(repos, url); } else { repos = createRepository(url, null, null, false); closeSession = true; } if (targetRev[0] < start) { getLocations(url, null, repos, SVNRevision.create(targetRev[0]), SVNRevision.create(start), SVNRevision.UNDEFINED); targetRev[0] = start; } implicitMergeInfo = getHistoryAsMergeInfo(url, null, SVNRevision.create(targetRev[0]), start, end, repos, null); if (sessionURL != null) { repos.setLocation(sessionURL, false); } } finally { if (closeSession) { repos.closeSession(); } } return implicitMergeInfo; }
SVNURL oldURL = ensureSessionURL(myRepository2, url1); try { final SVNDepth reportDepth = depth;
public Map calculateImplicitMergeInfo(SVNRepository repos, SVNURL url, long[] targetRev, long start, long end) throws SVNException { Map implicitMergeInfo = null; boolean closeSession = false; SVNURL sessionURL = null; try { if (repos != null) { sessionURL = ensureSessionURL(repos, url); } else { repos = createRepository(url, null, null, false); closeSession = true; } if (targetRev[0] < start) { getLocations(url, null, repos, SVNRevision.create(targetRev[0]), SVNRevision.create(start), SVNRevision.UNDEFINED); targetRev[0] = start; } implicitMergeInfo = getHistoryAsMergeInfo(url, null, SVNRevision.create(targetRev[0]), start, end, repos, null); if (sessionURL != null) { repos.setLocation(sessionURL, false); } } finally { if (closeSession) { repos.closeSession(); } } return implicitMergeInfo; }
SVNURL oldURL = ensureSessionURL(myRepository2, url1); try { final SVNDepth reportDepth = depth;
try { if (repos != null) { sessionURL = ensureSessionURL(repos, url); } else { repos = createRepository(url, null, null, false);
if (isRollBack && endRev != revision2) { realURL2 = url1; oldURL2 = ensureSessionURL(myRepository2, realURL2); oldURL1 = ensureSessionURL(myRepository1, realURL1);
if (isRollBack && endRev != revision2) { realURL2 = url1; oldURL2 = ensureSessionURL(myRepository2, realURL2); oldURL1 = ensureSessionURL(myRepository1, realURL1);
SVNMergeRangeList rangeListToMerge = remainingRangeList; if (myAreSourcesAncestral && remainingRangeList.getSize() > 1) { SVNURL oldSessionURL = ensureSessionURL(myRepository1, primaryURL); rangeListToMerge = removeNoOpMergeRanges(myRepository1, remainingRangeList); if (oldSessionURL != null) {
SVNMergeRangeList rangeListToMerge = remainingRangeList; if (myAreSourcesAncestral && remainingRangeList.getSize() > 1) { SVNURL oldSessionURL = ensureSessionURL(myRepository1, primaryURL); rangeListToMerge = removeNoOpMergeRanges(myRepository1, remainingRangeList); if (oldSessionURL != null) {