|
diff --git a/ui-diff.c b/ui-diff.c index 0c6f8d7..42e81ac 100644 --- a/ ui-diff.c+++ b/ ui-diff.c |
|
@@ -84,9 +84,9 @@ static void print_fileinfo(struct fileinfo *info) |
84 | html("]</span>"); |
84 | html("]</span>"); |
85 | } |
85 | } |
86 | htmlf("</td><td class='%s'>", class); |
86 | htmlf("</td><td class='%s'>", class); |
87 | cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.sha1, |
87 | cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.sha1, |
88 | ctx.qry.sha2, info->new_path); |
88 | ctx.qry.sha2, info->new_path, 0); |
89 | if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED) |
89 | if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED) |
90 | htmlf(" (%s from %s)", |
90 | htmlf(" (%s from %s)", |
91 | info->status == DIFF_STATUS_COPIED ? "copied" : "renamed", |
91 | info->status == DIFF_STATUS_COPIED ? "copied" : "renamed", |
92 | info->old_path); |
92 | info->old_path); |
@@ -159,9 +159,9 @@ void cgit_print_diffstat(const unsigned char *old_sha1, |
159 | int i; |
159 | int i; |
160 | |
160 | |
161 | html("<div class='diffstat-header'>"); |
161 | html("<div class='diffstat-header'>"); |
162 | cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.sha1, |
162 | cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.sha1, |
163 | ctx.qry.sha2, NULL); |
163 | ctx.qry.sha2, NULL, 0); |
164 | html("</div>"); |
164 | html("</div>"); |
165 | html("<table summary='diffstat' class='diffstat'>"); |
165 | html("<table summary='diffstat' class='diffstat'>"); |
166 | max_changes = 0; |
166 | max_changes = 0; |
167 | cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, NULL); |
167 | cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, NULL); |
@@ -249,8 +249,21 @@ static void header(unsigned char *sha1, char *path1, int mode1, |
249 | if (use_ssdiff) |
249 | if (use_ssdiff) |
250 | cgit_ssdiff_header(); |
250 | cgit_ssdiff_header(); |
251 | } |
251 | } |
252 | |
252 | |
| |
253 | static void print_ssdiff_link() |
| |
254 | { |
| |
255 | if (!strcmp(ctx.qry.page, "diff")) { |
| |
256 | if (use_ssdiff) |
| |
257 | cgit_diff_link("Unidiff", NULL, NULL, ctx.qry.head, |
| |
258 | ctx.qry.sha1, ctx.qry.sha2, NULL, 1); |
| |
259 | else |
| |
260 | cgit_diff_link("Side-by-side diff", NULL, NULL, |
| |
261 | ctx.qry.head, ctx.qry.sha1, |
| |
262 | ctx.qry.sha2, NULL, 1); |
| |
263 | } |
| |
264 | } |
| |
265 | |
253 | static void filepair_cb(struct diff_filepair *pair) |
266 | static void filepair_cb(struct diff_filepair *pair) |
254 | { |
267 | { |
255 | unsigned long old_size = 0; |
268 | unsigned long old_size = 0; |
256 | unsigned long new_size = 0; |
269 | unsigned long new_size = 0; |
@@ -313,8 +326,13 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefi |
313 | commit2 = lookup_commit_reference(old_rev_sha1); |
326 | commit2 = lookup_commit_reference(old_rev_sha1); |
314 | if (!commit2 || parse_commit(commit2)) |
327 | if (!commit2 || parse_commit(commit2)) |
315 | cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(old_rev_sha1))); |
328 | cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(old_rev_sha1))); |
316 | } |
329 | } |
| |
330 | |
| |
331 | if ((ctx.qry.ssdiff && !ctx.cfg.ssdiff) || (!ctx.qry.ssdiff && ctx.cfg.ssdiff)) |
| |
332 | use_ssdiff = 1; |
| |
333 | |
| |
334 | print_ssdiff_link(); |
317 | cgit_print_diffstat(old_rev_sha1, new_rev_sha1); |
335 | cgit_print_diffstat(old_rev_sha1, new_rev_sha1); |
318 | |
336 | |
319 | html("<table summary='diff' class='diff'>"); |
337 | html("<table summary='diff' class='diff'>"); |
320 | html("<tr><td>"); |
338 | html("<tr><td>"); |
|