diff options
| author | James Moger <james.moger@gitblit.com> | 2011-04-20 22:14:37 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2011-04-20 22:14:37 -0400 |
| commit | 3df3496185d229e6f1cdeb6f182f7933884ca29c (patch) | |
| tree | 3d2bec40535db0bb1001bb81c04812f9e8d6a018 /src/com/gitblit/utils/GitWebDiffFormatter.java | |
| parent | 531cd203f387f8358a2e15da5f6171f5871ea688 (diff) | |
| download | gitblit-3df3496185d229e6f1cdeb6f182f7933884ca29c.tar.gz gitblit-3df3496185d229e6f1cdeb6f182f7933884ca29c.zip | |
Selectable diff presentation: gitblit, gitweb, or plain.
Diffstat (limited to 'src/com/gitblit/utils/GitWebDiffFormatter.java')
| -rw-r--r-- | src/com/gitblit/utils/GitWebDiffFormatter.java | 131 |
1 files changed, 131 insertions, 0 deletions
diff --git a/src/com/gitblit/utils/GitWebDiffFormatter.java b/src/com/gitblit/utils/GitWebDiffFormatter.java new file mode 100644 index 00000000..2ac0a568 --- /dev/null +++ b/src/com/gitblit/utils/GitWebDiffFormatter.java @@ -0,0 +1,131 @@ +package com.gitblit.utils;
+
+import static org.eclipse.jgit.lib.Constants.encodeASCII;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+
+import org.eclipse.jgit.diff.DiffFormatter;
+import org.eclipse.jgit.diff.RawText;
+
+public class GitWebDiffFormatter extends DiffFormatter {
+
+ private final OutputStream os;
+
+ public GitWebDiffFormatter(OutputStream os) {
+ super(os);
+ this.os = os;
+ }
+
+ /**
+ * Output a hunk header
+ *
+ * @param aStartLine
+ * within first source
+ * @param aEndLine
+ * within first source
+ * @param bStartLine
+ * within second source
+ * @param bEndLine
+ * within second source
+ * @throws IOException
+ */
+ @Override
+ protected void writeHunkHeader(int aStartLine, int aEndLine, int bStartLine, int bEndLine) throws IOException {
+ os.write("<div class=\"diff hunk_header\"><span class=\"diff hunk_info\">".getBytes());
+ os.write('@');
+ os.write('@');
+ writeRange('-', aStartLine + 1, aEndLine - aStartLine);
+ writeRange('+', bStartLine + 1, bEndLine - bStartLine);
+ os.write(' ');
+ os.write('@');
+ os.write('@');
+ os.write("</span></div>".getBytes());
+ }
+
+ protected void writeRange(final char prefix, final int begin, final int cnt) throws IOException {
+ os.write(' ');
+ os.write(prefix);
+ switch (cnt) {
+ case 0:
+ // If the range is empty, its beginning number must
+ // be the
+ // line just before the range, or 0 if the range is
+ // at the
+ // start of the file stream. Here, begin is always 1
+ // based,
+ // so an empty file would produce "0,0".
+ //
+ os.write(encodeASCII(begin - 1));
+ os.write(',');
+ os.write('0');
+ break;
+
+ case 1:
+ // If the range is exactly one line, produce only
+ // the number.
+ //
+ os.write(encodeASCII(begin));
+ break;
+
+ default:
+ os.write(encodeASCII(begin));
+ os.write(',');
+ os.write(encodeASCII(cnt));
+ break;
+ }
+ }
+
+ @Override
+ protected void writeLine(final char prefix, final RawText text, final int cur) throws IOException {
+ switch (prefix) {
+ case '+':
+ os.write("<span class=\"diff add\">".getBytes());
+ break;
+ case '-':
+ os.write("<span class=\"diff remove\">".getBytes());
+ break;
+ }
+ os.write(prefix);
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ text.writeLine(bos, cur);
+ String line = bos.toString();
+ line = StringUtils.escapeForHtml(line, false);
+ os.write(line.getBytes());
+ switch (prefix) {
+ case '+':
+ case '-':
+ os.write("</span>\n".getBytes());
+ break;
+ default:
+ os.write('\n');
+ }
+ }
+
+ /**
+ * Workaround function for complex private methods in DiffFormatter. This
+ * sets the html for the diff headers.
+ *
+ * @return
+ */
+ public String getHtml() {
+ String html = os.toString();
+ String[] lines = html.split("\n");
+ StringBuilder sb = new StringBuilder();
+ sb.append("<div class=\"diff\">");
+ for (String line : lines) {
+ if (line.startsWith("diff")) {
+ sb.append("<div class=\"diff header\">").append(line).append("</div>");
+ } else if (line.startsWith("---")) {
+ sb.append("<span class=\"diff remove\">").append(line).append("</span><br/>");
+ } else if (line.startsWith("+++")) {
+ sb.append("<span class=\"diff add\">").append(line).append("</span><br/>");
+ } else {
+ sb.append(line).append('\n');
+ }
+ }
+ sb.append("</div>\n");
+ return sb.toString();
+ }
+}
|