/** * @param path * @param pegRevision * @return mergeinfo * @throws SVNException * @deprecated use {@link org.tmatesoft.svn.core.wc.SVNDiffClient#doGetMergedMergeInfo(File, SVNRevision)} * instead */ public Map getMergedMergeInfo(File path, SVNRevision pegRevision) throws SVNException { if (this instanceof SVNDiffClient) { SVNDiffClient diffClient = (SVNDiffClient) this; return diffClient.doGetMergedMergeInfo(path, pegRevision); } return null; }
/** * @param url * @param pegRevision * @return mergeinfo * @throws SVNException * @deprecated use {@link org.tmatesoft.svn.core.wc.SVNDiffClient#doGetMergedMergeInfo(SVNURL, SVNRevision)} * instead */ public Map getMergedMergeInfo(SVNURL url, SVNRevision pegRevision) throws SVNException { if (this instanceof SVNDiffClient) { SVNDiffClient diffClient = (SVNDiffClient) this; return diffClient.doGetMergedMergeInfo(url, pegRevision); } return null; }
/** * @param url * @param pegRevision * @return mergeinfo * @throws SVNException * @deprecated use {@link org.tmatesoft.svn.core.wc.SVNDiffClient#doGetMergedMergeInfo(SVNURL, SVNRevision)} * instead */ public Map getMergedMergeInfo(SVNURL url, SVNRevision pegRevision) throws SVNException { if (this instanceof SVNDiffClient) { SVNDiffClient diffClient = (SVNDiffClient) this; return diffClient.doGetMergedMergeInfo(url, pegRevision); } return null; }
/** * @param path * @param pegRevision * @return mergeinfo * @throws SVNException * @deprecated use {@link org.tmatesoft.svn.core.wc.SVNDiffClient#doGetMergedMergeInfo(File, SVNRevision)} * instead */ public Map getMergedMergeInfo(File path, SVNRevision pegRevision) throws SVNException { if (this instanceof SVNDiffClient) { SVNDiffClient diffClient = (SVNDiffClient) this; return diffClient.doGetMergedMergeInfo(path, pegRevision); } return null; }
Map mergeInfo = doGetMergedMergeInfo(url, pegRevision); if (mergeInfo != null) { for (Iterator mergeSrcURLs = mergeInfo.keySet().iterator(); mergeSrcURLs.hasNext();) {
Map mergeInfo = doGetMergedMergeInfo(url, pegRevision); if (mergeInfo != null) { for (Iterator mergeSrcURLs = mergeInfo.keySet().iterator(); mergeSrcURLs.hasNext();) {
Map mergeInfo = doGetMergedMergeInfo(path, pegRevision); if (mergeInfo != null) { for (Iterator mergeSrcURLs = mergeInfo.keySet().iterator(); mergeSrcURLs.hasNext();) {
Map mergeInfo = doGetMergedMergeInfo(path, pegRevision); if (mergeInfo != null) { for (Iterator mergeSrcURLs = mergeInfo.keySet().iterator(); mergeSrcURLs.hasNext();) {
public Mergeinfo getMergeinfo(String path, Revision revision) throws SubversionException { SVNDiffClient client = getSVNDiffClient(); Map mergeInfo = null; try { if (isURL(path)) { mergeInfo = client.doGetMergedMergeInfo(SVNURL.parseURIEncoded(path), JavaHLObjectFactory.getSVNRevision(revision)); } else { mergeInfo = client.doGetMergedMergeInfo(new File(path).getAbsoluteFile(), JavaHLObjectFactory.getSVNRevision(revision)); } return JavaHLObjectFactory.createMergeInfo(mergeInfo); } catch (SVNException e) { throwException(e); } finally { resetLog(); } return null; }
public Mergeinfo getMergeinfo(String path, Revision revision) throws SubversionException { SVNDiffClient client = getSVNDiffClient(); Map mergeInfo = null; try { if (isURL(path)) { mergeInfo = client.doGetMergedMergeInfo(SVNURL.parseURIEncoded(path), JavaHLObjectFactory.getSVNRevision(revision)); } else { mergeInfo = client.doGetMergedMergeInfo(new File(path).getAbsoluteFile(), JavaHLObjectFactory.getSVNRevision(revision)); } return JavaHLObjectFactory.createMergeInfo(mergeInfo); } catch (SVNException e) { throwException(e); } finally { resetLog(); } return null; }
public Mergeinfo getMergeinfo(String path, Revision revision) throws SubversionException { SVNDiffClient client = getSVNDiffClient(); Map mergeInfo = null; try { if (isURL(path)) { mergeInfo = client.doGetMergedMergeInfo(SVNURL.parseURIEncoded(path), JavaHLObjectFactory.getSVNRevision(revision)); } else { mergeInfo = client.doGetMergedMergeInfo(new File(path).getAbsoluteFile(), JavaHLObjectFactory.getSVNRevision(revision)); } return JavaHLObjectFactory.createMergeInfo(mergeInfo); } catch (SVNException e) { throwException(e); } finally { resetLog(); } return null; }
Map<SVNURL, SVNMergeRangeList> before = diffClient.doGetMergedMergeInfo(url, rm1); @SuppressWarnings("unchecked") Map<SVNURL, SVNMergeRangeList> after = diffClient.doGetMergedMergeInfo(url, r);