|
diff --git a/ui-diff.c b/ui-diff.c index 0bd9ade..b6486f1 100644 --- a/ ui-diff.c+++ b/ ui-diff.c |
|
@@ -103,29 +103,28 @@ static void run_diff(const unsigned char *sha1, const unsigned char *sha2) |
103 | if (!load_mmfile(&file1, sha1) || !load_mmfile(&file2, sha2)) { |
103 | if (!load_mmfile(&file1, sha1) || !load_mmfile(&file2, sha2)) { |
104 | cgit_print_error("Unable to load files for diff"); |
104 | cgit_print_error("Unable to load files for diff"); |
105 | return; |
105 | return; |
106 | } |
106 | } |
107 | |
107 | |
108 | diff_params.flags = XDF_NEED_MINIMAL; |
108 | diff_params.flags = XDF_NEED_MINIMAL; |
109 | |
109 | |
110 | emit_params.ctxlen = 3; |
110 | emit_params.ctxlen = 3; |
111 | emit_params.flags = XDL_EMIT_FUNCNAMES; |
111 | emit_params.flags = XDL_EMIT_FUNCNAMES; |
112 | |
112 | |
113 | emit_cb.outf = diff_cb; |
113 | emit_cb.outf = diff_cb; |
114 | |
114 | |
115 | xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); |
115 | xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); |
116 | } |
116 | } |
117 | |
117 | |
118 | |
118 | |
119 | |
119 | |
120 | void cgit_print_diff(const char *old_hex, const char *new_hex) |
120 | void cgit_print_diff(const char *old_hex, const char *new_hex) |
121 | { |
121 | { |
122 | unsigned char sha1[20], sha2[20]; |
122 | unsigned char sha1[20], sha2[20]; |
123 | |
123 | |
124 | get_sha1(old_hex, sha1); |
124 | get_sha1(old_hex, sha1); |
125 | get_sha1(new_hex, sha2); |
125 | get_sha1(new_hex, sha2); |
126 | |
126 | |
127 | html("<h2>diff</h2>\n"); |
| |
128 | html("<table class='diff'><tr><td>"); |
127 | html("<table class='diff'><tr><td>"); |
129 | run_diff(sha1, sha2); |
128 | run_diff(sha1, sha2); |
130 | html("</td></tr></table>"); |
129 | html("</td></tr></table>"); |
131 | } |
130 | } |
|