James Moger
2011-04-21 a645ba09d693495c50ab0ee0d1fc2734407b73a4
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
package com.gitblit.utils;
 
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
 
import org.eclipse.jgit.diff.RawText;
 
public class GitBlitDiffFormatter extends GitWebDiffFormatter {
 
    private final OutputStream os;
 
    private int left = 0, right = 0;
 
    public GitBlitDiffFormatter(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("<tr><th>..</th><th>..</th><td class='hunk_header'>".getBytes());
        os.write('@');
        os.write('@');
        writeRange('-', aStartLine + 1, aEndLine - aStartLine);
        writeRange('+', bStartLine + 1, bEndLine - bStartLine);
        os.write(' ');
        os.write('@');
        os.write('@');
        os.write("</td></tr>\n".getBytes());
        left = aStartLine + 1;
        right = bStartLine + 1;
    }
 
    @Override
    protected void writeLine(final char prefix, final RawText text, final int cur) throws IOException {
        os.write("<tr>".getBytes());
        switch (prefix) {
        case '+':
            os.write(("<th></th><th>" + (right++) + "</th>").getBytes());
            os.write("<td><div class=\"diff add2\">".getBytes());
            break;
        case '-':
            os.write(("<th>" + (left++) + "</th><th></th>").getBytes());
            os.write("<td><div class=\"diff remove2\">".getBytes());
            break;
        default:
            os.write(("<th>" + (left++) + "</th><th>" + (right++) + "</th>").getBytes());
            os.write("<td>".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("</div>".getBytes());
            break;
        default:
            os.write("</td>".getBytes());
        }
        os.write("</tr>\n".getBytes());
    }
 
    /**
     * Workaround function for complex private methods in DiffFormatter. This
     * sets the html for the diff headers.
     * 
     * @return
     */
    @Override
    public String getHtml() {
        String html = os.toString();
        String[] lines = html.split("\n");
        StringBuilder sb = new StringBuilder();        
        boolean inFile = false;
        String oldnull = "a/dev/null";
        for (String line : lines) {
            if (line.startsWith("index")) {
                // skip index lines
            } else if (line.startsWith("new file")) {
                // skip new file lines
            } else if (line.startsWith("\\ No newline")) {
                // skip no new line
            } else if (line.startsWith("---") || line.startsWith("+++")) {
                // skip --- +++ lines
            } else if (line.startsWith("diff")) {
                if (line.indexOf(oldnull) > -1) {
                    // a is null, use b
                    line = line.substring(("diff --git " + oldnull).length()).trim();
                    line = line.substring(2); // trim b/
                } else {
                    // use a
                    line = line.substring("diff --git a/".length()).trim();
                    line = line.substring(0, line.indexOf(" b/")).trim();
                }
                if (inFile) {
                    sb.append("</tbody></table></div>\n");
                    inFile = false;
                }
                sb.append("<div class='header'>").append(line).append("</div>");
                sb.append("<div class=\"diff\">");    
                sb.append("<table><tbody>");
                inFile = true;
            } else {
                sb.append(line).append('\n');
            }
        }
        sb.append("</table></div>");
        return sb.toString();
    }
}