private String getCharset(String charset, DefaultSVNDiffGenerator generator, boolean allowNative) { if (charset == null) { return null; } if (allowNative && SVNProperty.NATIVE.equals(charset)) { return generator.getEncoding(); } if (Charset.isSupported(charset)) { return charset; } return null; }
private String getCharset(String charset, DefaultSVNDiffGenerator generator, boolean allowNative) { if (charset == null) { return null; } if (allowNative && SVNProperty.NATIVE.equals(charset)) { return generator.getEncoding(); } if (Charset.isSupported(charset)) { return charset; } return null; }
protected void displayHeaderFields(OutputStream os, String label1, String label2) throws IOException { os.write("--- ".getBytes(getEncoding())); os.write(label1.getBytes(getEncoding())); os.write(getEOL()); os.write("+++ ".getBytes(getEncoding())); os.write(label2.getBytes(getEncoding())); os.write(getEOL()); }
protected void displayHeaderFields(OutputStream os, String label1, String label2) throws IOException { os.write("--- ".getBytes(getEncoding())); os.write(label1.getBytes(getEncoding())); os.write(getEOL()); os.write("+++ ".getBytes(getEncoding())); os.write(label2.getBytes(getEncoding())); os.write(getEOL()); }
protected void displayHeaderFields(OutputStream os, String label1, String label2) throws IOException { os.write("--- ".getBytes(getEncoding())); os.write(label1.getBytes(getEncoding())); os.write(getEOL()); os.write("+++ ".getBytes(getEncoding())); os.write(label2.getBytes(getEncoding())); os.write(getEOL()); }
protected boolean displayHeader(OutputStream os, String path, boolean deleted) throws IOException { if (deleted && !isDiffDeleted()) { os.write("Index: ".getBytes(getEncoding())); os.write(path.getBytes(getEncoding())); os.write(" (deleted)".getBytes(getEncoding())); os.write(getEOL()); os.write(HEADER_SEPARATOR.getBytes(getEncoding())); os.write(getEOL()); return true; } os.write("Index: ".getBytes(getEncoding())); os.write(path.getBytes(getEncoding())); os.write(getEOL()); os.write(HEADER_SEPARATOR.getBytes(getEncoding())); os.write(getEOL()); return false; }
protected boolean displayHeader(OutputStream os, String path, boolean deleted) throws IOException { if (deleted && !isDiffDeleted()) { os.write("Index: ".getBytes(getEncoding())); os.write(path.getBytes(getEncoding())); os.write(" (deleted)".getBytes(getEncoding())); os.write(getEOL()); os.write(HEADER_SEPARATOR.getBytes(getEncoding())); os.write(getEOL()); return true; } os.write("Index: ".getBytes(getEncoding())); os.write(path.getBytes(getEncoding())); os.write(getEOL()); os.write(HEADER_SEPARATOR.getBytes(getEncoding())); os.write(getEOL()); return false; }
protected boolean displayHeader(OutputStream os, String path, boolean deleted) throws IOException { if (deleted && !isDiffDeleted()) { os.write("Index: ".getBytes(getEncoding())); os.write(path.getBytes(getEncoding())); os.write(" (deleted)".getBytes(getEncoding())); os.write(getEOL()); os.write(HEADER_SEPARATOR); os.write(getEOL()); return true; } os.write("Index: ".getBytes(getEncoding())); os.write(path.getBytes(getEncoding())); os.write(getEOL()); os.write(HEADER_SEPARATOR); os.write(getEOL()); return false; }
protected void displayBinary(OutputStream os, String mimeType1, String mimeType2) throws IOException { os.write("Cannot display: file marked as a binary type.".getBytes(getEncoding())); os.write(getEOL()); if (SVNProperty.isBinaryMimeType(mimeType1) && !SVNProperty.isBinaryMimeType(mimeType2)) { os.write("svn:mime-type = ".getBytes(getEncoding())); os.write(mimeType1.getBytes(getEncoding())); os.write(getEOL()); } else if (!SVNProperty.isBinaryMimeType(mimeType1) && SVNProperty.isBinaryMimeType(mimeType2)) { os.write("svn:mime-type = ".getBytes(getEncoding())); os.write(mimeType2.getBytes(getEncoding())); os.write(getEOL()); } else if (SVNProperty.isBinaryMimeType(mimeType1) && SVNProperty.isBinaryMimeType(mimeType2)) { if (mimeType1.equals(mimeType2)) { os.write("svn:mime-type = ".getBytes(getEncoding())); os.write(mimeType2.getBytes(getEncoding())); os.write(getEOL()); } else { os.write("svn:mime-type = (".getBytes(getEncoding())); os.write(mimeType1.getBytes(getEncoding())); os.write(", ".getBytes(getEncoding())); os.write(mimeType2.getBytes(getEncoding())); os.write(")".getBytes(getEncoding())); os.write(getEOL()); } } }
protected void displayBinary(OutputStream os, String mimeType1, String mimeType2) throws IOException { os.write("Cannot display: file marked as a binary type.".getBytes(getEncoding())); os.write(getEOL()); if (SVNProperty.isBinaryMimeType(mimeType1) && !SVNProperty.isBinaryMimeType(mimeType2)) { os.write("svn:mime-type = ".getBytes(getEncoding())); os.write(mimeType1.getBytes(getEncoding())); os.write(getEOL()); } else if (!SVNProperty.isBinaryMimeType(mimeType1) && SVNProperty.isBinaryMimeType(mimeType2)) { os.write("svn:mime-type = ".getBytes(getEncoding())); os.write(mimeType2.getBytes(getEncoding())); os.write(getEOL()); } else if (SVNProperty.isBinaryMimeType(mimeType1) && SVNProperty.isBinaryMimeType(mimeType2)) { if (mimeType1.equals(mimeType2)) { os.write("svn:mime-type = ".getBytes(getEncoding())); os.write(mimeType2.getBytes(getEncoding())); os.write(getEOL()); } else { os.write("svn:mime-type = (".getBytes(getEncoding())); os.write(mimeType1.getBytes(getEncoding())); os.write(", ".getBytes(getEncoding())); os.write(mimeType2.getBytes(getEncoding())); os.write(")".getBytes(getEncoding())); os.write(getEOL()); } } }
protected void displayBinary(OutputStream os, String mimeType1, String mimeType2) throws IOException { os.write("Cannot display: file marked as a binary type.".getBytes(getEncoding())); os.write(getEOL()); if (SVNProperty.isBinaryMimeType(mimeType1) && !SVNProperty.isBinaryMimeType(mimeType2)) { os.write("svn:mime-type = ".getBytes(getEncoding())); os.write(mimeType1.getBytes(getEncoding())); os.write(getEOL()); } else if (!SVNProperty.isBinaryMimeType(mimeType1) && SVNProperty.isBinaryMimeType(mimeType2)) { os.write("svn:mime-type = ".getBytes(getEncoding())); os.write(mimeType2.getBytes(getEncoding())); os.write(getEOL()); } else if (SVNProperty.isBinaryMimeType(mimeType1) && SVNProperty.isBinaryMimeType(mimeType2)) { if (mimeType1.equals(mimeType2)) { os.write("svn:mime-type = ".getBytes(getEncoding())); os.write(mimeType2.getBytes(getEncoding())); os.write(getEOL()); } else { os.write("svn:mime-type = (".getBytes(getEncoding())); os.write(mimeType1.getBytes(getEncoding())); os.write(", ".getBytes(getEncoding())); os.write(mimeType2.getBytes(getEncoding())); os.write(")".getBytes(getEncoding())); os.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(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()); } }
try { bos.write(EOL); bos.write(("Property changes on: " + path.replace('/', File.separatorChar)).getBytes(getEncoding())); bos.write(EOL); bos.write(PROPERTIES_SEPARATOR); String originalValue = baseProps != null ? (String) baseProps.get(name) : null; String newValue = (String) diff.get(name); bos.write(("Name: " + name).getBytes(getEncoding())); bos.write(EOL); if (originalValue != null) { bos.write(" - ".getBytes(getEncoding())); bos.write(originalValue.getBytes(getEncoding())); bos.write(EOL); bos.write(" + ".getBytes(getEncoding())); bos.write(newValue.getBytes(getEncoding())); bos.write(EOL);
try { if (file2 == null && !isDiffDeleted()) { bos.write("Index: ".getBytes(getEncoding())); bos.write(path.getBytes(getEncoding())); bos.write(" (deleted)".getBytes(getEncoding())); bos.write(EOL); bos.write(HEADER_SEPARATOR); bos.write("Index: ".getBytes(getEncoding())); bos.write(path.getBytes(getEncoding())); bos.write(EOL); bos.write(HEADER_SEPARATOR); bos.write("Cannot display: file marked as binary type.".getBytes(getEncoding())); bos.write(EOL); if (SVNProperty.isBinaryMimeType(mimeType1) && !SVNProperty.isBinaryMimeType(mimeType2)) { bos.write("svn:mime-type = ".getBytes(getEncoding())); bos.write(mimeType1.getBytes(getEncoding())); bos.write(EOL); } else if (!SVNProperty.isBinaryMimeType(mimeType1) && SVNProperty.isBinaryMimeType(mimeType2)) { bos.write("svn:mime-type = ".getBytes(getEncoding())); bos.write(mimeType2.getBytes(getEncoding())); bos.write(EOL); } else if (SVNProperty.isBinaryMimeType(mimeType1) && SVNProperty.isBinaryMimeType(mimeType2)) { if (mimeType1.equals(mimeType2)) { bos.write("svn:mime-type = ".getBytes(getEncoding()));
try { bos.write(getEOL()); bos.write(("Property changes on: " + (useLocalFileSeparatorChar() ? path.replace('/', File.separatorChar) : path)).getBytes(getEncoding())); bos.write(getEOL()); bos.write(PROPERTIES_SEPARATOR.getBytes(getEncoding())); bos.write(getEOL()); for (Iterator changedPropNames = diff.nameSet().iterator(); changedPropNames.hasNext();) { bos.write((headerFormat + name).getBytes(getEncoding())); bos.write(getEOL()); if (SVNProperty.MERGE_INFO.equals(name)) { bos.write(" - ".getBytes(getEncoding())); bos.write(getPropertyAsBytes(originalValue, getEncoding())); bos.write(getEOL()); bos.write(" + ".getBytes(getEncoding())); bos.write(getPropertyAsBytes(newValue, getEncoding())); bos.write(getEOL());
try { bos.write(getEOL()); bos.write(("Property changes on: " + (useLocalFileSeparatorChar() ? path.replace('/', File.separatorChar) : path)).getBytes(getEncoding())); bos.write(getEOL()); bos.write(PROPERTIES_SEPARATOR.getBytes(getEncoding())); bos.write(getEOL()); for (Iterator changedPropNames = diff.nameSet().iterator(); changedPropNames.hasNext();) { bos.write((headerFormat + name).getBytes(getEncoding())); bos.write(getEOL()); if (SVNProperty.MERGE_INFO.equals(name)) { bos.write(" - ".getBytes(getEncoding())); bos.write(getPropertyAsBytes(originalValue, getEncoding())); bos.write(getEOL()); bos.write(" + ".getBytes(getEncoding())); bos.write(getPropertyAsBytes(newValue, getEncoding())); bos.write(getEOL());
try { bos.write(getEOL()); bos.write(("Property changes on: " + (useLocalFileSeparatorChar() ? path.replace('/', File.separatorChar) : path)).getBytes(getEncoding())); bos.write(getEOL()); bos.write(PROPERTIES_SEPARATOR); bos.write((headerFormat + name).getBytes(getEncoding())); bos.write(getEOL()); if (SVNProperty.MERGE_INFO.equals(name)) { bos.write(" - ".getBytes(getEncoding())); bos.write(getPropertyAsBytes(originalValue, getEncoding())); bos.write(getEOL()); bos.write(" + ".getBytes(getEncoding())); bos.write(getPropertyAsBytes(newValue, getEncoding())); bos.write(getEOL());
final Writer writer = new OutputStreamWriter(result, getEncoding()); try { bos.close(); header = bos.toString(getEncoding()); } catch (IOException inner) { header = ""; Writer writer = new OutputStreamWriter(result, getEncoding()); QDiffManager.generateTextDiff(is1, is2, getEncoding(), writer, generator); writer.flush(); } catch (IOException e) {