private String addSourcePathes(SVNMergeInfo mergeInfo) { StringBuffer result = new StringBuffer(); for (Iterator iterator = mergeInfo.getMergeSourcesToMergeLists().entrySet().iterator(); iterator.hasNext();) { Map.Entry entry = (Map.Entry) iterator.next(); String sourcePath = (String) entry.getKey(); SVNMergeRangeList rangeList = (SVNMergeRangeList) entry.getValue(); result.append(sourcePath); result.append(":"); result.append(rangeList.toString()); if (iterator.hasNext()) { result.append('\n'); } } return result.toString(); } }
private void displayMergeInfoDiff(ByteArrayOutputStream baos, String oldValue, String newValue) throws SVNException, IOException { Map oldMergeInfo = null; Map newMergeInfo = null; if (oldValue != null) { oldMergeInfo = SVNMergeInfoUtil.parseMergeInfo(new StringBuffer(oldValue), null); } if (newValue != null) { newMergeInfo = SVNMergeInfoUtil.parseMergeInfo(new StringBuffer(newValue), null); } Map deleted = new TreeMap(); Map added = new TreeMap(); SVNMergeInfoUtil.diffMergeInfo(deleted, added, oldMergeInfo, newMergeInfo, true); for (Iterator paths = deleted.keySet().iterator(); paths.hasNext();) { String path = (String) paths.next(); SVNMergeRangeList rangeList = (SVNMergeRangeList) deleted.get(path); baos.write((" Reverse-merged " + path + ":r").getBytes(getEncoding())); baos.write(rangeList.toString().getBytes(getEncoding())); baos.write(getEOL()); } for (Iterator paths = added.keySet().iterator(); paths.hasNext();) { String path = (String) paths.next(); SVNMergeRangeList rangeList = (SVNMergeRangeList) added.get(path); baos.write((" Merged " + path + ":r").getBytes(getEncoding())); baos.write(rangeList.toString().getBytes(getEncoding())); baos.write(getEOL()); } }
private void displayMergeInfoDiff(ByteArrayOutputStream baos, String oldValue, String newValue) throws SVNException, IOException { Map oldMergeInfo = null; Map newMergeInfo = null; if (oldValue != null) { oldMergeInfo = SVNMergeInfoUtil.parseMergeInfo(new StringBuffer(oldValue), null); } if (newValue != null) { newMergeInfo = SVNMergeInfoUtil.parseMergeInfo(new StringBuffer(newValue), null); } Map deleted = new TreeMap(); Map added = new TreeMap(); SVNMergeInfoUtil.diffMergeInfo(deleted, added, oldMergeInfo, newMergeInfo, true); for (Iterator paths = deleted.keySet().iterator(); paths.hasNext();) { String path = (String) paths.next(); SVNMergeRangeList rangeList = (SVNMergeRangeList) deleted.get(path); baos.write((" Reverse-merged " + path + ":r").getBytes(getEncoding())); baos.write(rangeList.toString().getBytes(getEncoding())); baos.write(getEOL()); } for (Iterator paths = added.keySet().iterator(); paths.hasNext();) { String path = (String) paths.next(); SVNMergeRangeList rangeList = (SVNMergeRangeList) added.get(path); baos.write((" Merged " + path + ":r").getBytes(getEncoding())); baos.write(rangeList.toString().getBytes(getEncoding())); baos.write(getEOL()); } }
private void displayMergeInfoDiff(ByteArrayOutputStream baos, String oldValue, String newValue) throws SVNException, IOException { Map oldMergeInfo = null; Map newMergeInfo = null; if (oldValue != null) { oldMergeInfo = SVNMergeInfoUtil.parseMergeInfo(new StringBuffer(oldValue), null); } if (newValue != null) { newMergeInfo = SVNMergeInfoUtil.parseMergeInfo(new StringBuffer(newValue), null); } Map deleted = new TreeMap(); Map added = new TreeMap(); SVNMergeInfoUtil.diffMergeInfo(deleted, added, oldMergeInfo, newMergeInfo, true); for (Iterator paths = deleted.keySet().iterator(); paths.hasNext();) { String path = (String) paths.next(); SVNMergeRangeList rangeList = (SVNMergeRangeList) deleted.get(path); baos.write((" Reverse-merged " + path + ":r").getBytes(getEncoding())); baos.write(rangeList.toString().getBytes(getEncoding())); baos.write(getEOL()); } for (Iterator paths = added.keySet().iterator(); paths.hasNext();) { String path = (String) paths.next(); SVNMergeRangeList rangeList = (SVNMergeRangeList) added.get(path); baos.write((" Merged " + path + ":r").getBytes(getEncoding())); baos.write(rangeList.toString().getBytes(getEncoding())); baos.write(getEOL()); } }
private void displayMergeInfoDiff(OutputStream outputStream, String oldValue, String newValue) throws SVNException, IOException { Map oldMergeInfo = null; Map newMergeInfo = null; if (oldValue != null) { oldMergeInfo = SVNMergeInfoUtil.parseMergeInfo(new StringBuffer(oldValue), null); } if (newValue != null) { newMergeInfo = SVNMergeInfoUtil.parseMergeInfo(new StringBuffer(newValue), null); } Map deleted = new TreeMap(); Map added = new TreeMap(); SVNMergeInfoUtil.diffMergeInfo(deleted, added, oldMergeInfo, newMergeInfo, true); for (Iterator paths = deleted.keySet().iterator(); paths.hasNext();) { String path = (String) paths.next(); SVNMergeRangeList rangeList = (SVNMergeRangeList) deleted.get(path); displayString(outputStream, (" Reverse-merged " + path + ":r")); displayString(outputStream, rangeList.toString()); displayEOL(outputStream); } for (Iterator paths = added.keySet().iterator(); paths.hasNext();) { String path = (String) paths.next(); SVNMergeRangeList rangeList = (SVNMergeRangeList) added.get(path); displayString(outputStream, (" Merged " + path + ":r")); displayString(outputStream, rangeList.toString()); displayEOL(outputStream); } }
public String toString() { StringBuffer buffer = new StringBuffer(); buffer.append("merge task: source from "); buffer.append(getMergeSource()); buffer.append("; source to"); buffer.append(getMergeSource2()); buffer.append("; target "); buffer.append(getMergeTarget()); buffer.append("; revision ranges "); if (getRemainingRanges() == null) { buffer.append("[NULL]"); } else { buffer.append(getRemainingRanges().toString()); } buffer.append("; copy source "); if (getTargetCopySource() != null) { buffer.append(getTargetCopySource().isURL() ? getTargetCopySource().getURL().toString() : getTargetCopySource().getFile().getAbsolutePath()); buffer.append("@"); buffer.append(getTargetCopySource().getPegRevision().toString()); buffer.append(" revision "); buffer.append(getTargetCopySource().getRevision()); } else { buffer.append("[NULL]"); } return buffer.toString(); } }
writer.write(getRemainingRanges().toString());