|
diff --git a/ui-diff.c b/ui-diff.c index 42e81ac..b21c2c1 100644 --- a/ ui-diff.c+++ b/ ui-diff.c |
|
@@ -247,6 +247,4 @@ static void header(unsigned char *sha1, char *path1, int mode1, |
247 | } |
247 | } |
248 | html("</div>"); |
248 | html("</div>"); |
249 | if (use_ssdiff) |
| |
250 | cgit_ssdiff_header(); |
| |
251 | } |
249 | } |
252 | |
250 | |
@@ -271,15 +269,17 @@ static void filepair_cb(struct diff_filepair *pair) |
271 | linediff_fn print_line_fn = print_line; |
269 | linediff_fn print_line_fn = print_line; |
272 | |
270 | |
273 | header(pair->one->sha1, pair->one->path, pair->one->mode, |
| |
274 | pair->two->sha1, pair->two->path, pair->two->mode); |
| |
275 | if (use_ssdiff) { |
271 | if (use_ssdiff) { |
276 | cgit_ssdiff_header(); |
272 | cgit_ssdiff_header_begin(); |
277 | print_line_fn = cgit_ssdiff_line_cb; |
273 | print_line_fn = cgit_ssdiff_line_cb; |
278 | } |
274 | } |
| |
275 | header(pair->one->sha1, pair->one->path, pair->one->mode, |
| |
276 | pair->two->sha1, pair->two->path, pair->two->mode); |
| |
277 | if (use_ssdiff) |
| |
278 | cgit_ssdiff_header_end(); |
279 | if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) { |
279 | if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) { |
280 | if (S_ISGITLINK(pair->one->mode)) |
280 | if (S_ISGITLINK(pair->one->mode)) |
281 | print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52); |
281 | print_line_fn(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52); |
282 | if (S_ISGITLINK(pair->two->mode)) |
282 | if (S_ISGITLINK(pair->two->mode)) |
283 | print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); |
283 | print_line_fn(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); |
284 | return; |
284 | return; |
285 | } |
285 | } |
@@ -288,5 +288,5 @@ static void filepair_cb(struct diff_filepair *pair) |
288 | cgit_print_error("Error running diff"); |
288 | cgit_print_error("Error running diff"); |
289 | if (binary) |
289 | if (binary) |
290 | html("Binary files differ"); |
290 | print_line_fn(" Binary files differ", 20); |
291 | if (use_ssdiff) |
291 | if (use_ssdiff) |
292 | cgit_ssdiff_footer(); |
292 | cgit_ssdiff_footer(); |
@@ -335,7 +335,12 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefi |
335 | cgit_print_diffstat(old_rev_sha1, new_rev_sha1); |
335 | cgit_print_diffstat(old_rev_sha1, new_rev_sha1); |
336 | |
336 | |
| |
337 | if (use_ssdiff) { |
| |
338 | html("<table summary='ssdiff' class='ssdiff'>"); |
| |
339 | } else { |
337 | html("<table summary='diff' class='diff'>"); |
340 | html("<table summary='diff' class='diff'>"); |
338 | html("<tr><td>"); |
341 | html("<tr><td>"); |
| |
342 | } |
339 | cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix); |
343 | cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix); |
| |
344 | if (!use_ssdiff) |
340 | html("</td></tr>"); |
345 | html("</td></tr>"); |
341 | html("</table>"); |
346 | html("</table>"); |
|