|
diff --git a/ui-diff.c b/ui-diff.c index e0a72f7..1656b77 100644 --- a/ ui-diff.c+++ b/ ui-diff.c |
|
@@ -124,13 +124,13 @@ static void inspect_filepair(struct diff_filepair *pair) |
124 | unsigned long old_size = 0; |
124 | unsigned long old_size = 0; |
125 | unsigned long new_size = 0; |
125 | unsigned long new_size = 0; |
126 | files++; |
126 | files++; |
127 | lines_added = 0; |
127 | lines_added = 0; |
128 | lines_removed = 0; |
128 | lines_removed = 0; |
129 | cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, &new_size, |
129 | cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, &new_size, |
130 | &binary, 0, count_diff_lines); |
130 | &binary, 0, ctx.qry.ignorews, count_diff_lines); |
131 | if (files >= slots) { |
131 | if (files >= slots) { |
132 | if (slots == 0) |
132 | if (slots == 0) |
133 | slots = 4; |
133 | slots = 4; |
134 | else |
134 | else |
135 | slots = slots * 2; |
135 | slots = slots * 2; |
136 | items = xrealloc(items, slots * sizeof(struct fileinfo)); |
136 | items = xrealloc(items, slots * sizeof(struct fileinfo)); |
@@ -171,13 +171,14 @@ void cgit_print_diffstat(const unsigned char *old_sha1, |
171 | cgit_self_link("less", NULL, NULL, &ctx); |
171 | cgit_self_link("less", NULL, NULL, &ctx); |
172 | ctx.qry.context = save_context; |
172 | ctx.qry.context = save_context; |
173 | html(" context)"); |
173 | html(" context)"); |
174 | html("</div>"); |
174 | html("</div>"); |
175 | html("<table summary='diffstat' class='diffstat'>"); |
175 | html("<table summary='diffstat' class='diffstat'>"); |
176 | max_changes = 0; |
176 | max_changes = 0; |
177 | cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, prefix); |
177 | cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, prefix, |
| |
178 | ctx.qry.ignorews); |
178 | for(i = 0; i<files; i++) |
179 | for(i = 0; i<files; i++) |
179 | print_fileinfo(&items[i]); |
180 | print_fileinfo(&items[i]); |
180 | html("</table>"); |
181 | html("</table>"); |
181 | html("<div class='diffstat-summary'>"); |
182 | html("<div class='diffstat-summary'>"); |
182 | htmlf("%d files changed, %d insertions, %d deletions", |
183 | htmlf("%d files changed, %d insertions, %d deletions", |
183 | files, total_adds, total_rems); |
184 | files, total_adds, total_rems); |
@@ -293,13 +294,14 @@ static void filepair_cb(struct diff_filepair *pair) |
293 | print_line_fn(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); |
294 | print_line_fn(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); |
294 | if (use_ssdiff) |
295 | if (use_ssdiff) |
295 | cgit_ssdiff_footer(); |
296 | cgit_ssdiff_footer(); |
296 | return; |
297 | return; |
297 | } |
298 | } |
298 | if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, |
299 | if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, |
299 | &new_size, &binary, ctx.qry.context, print_line_fn)) |
300 | &new_size, &binary, ctx.qry.context, |
| |
301 | ctx.qry.ignorews, print_line_fn)) |
300 | cgit_print_error("Error running diff"); |
302 | cgit_print_error("Error running diff"); |
301 | if (binary) { |
303 | if (binary) { |
302 | if (use_ssdiff) |
304 | if (use_ssdiff) |
303 | html("<tr><td colspan='4'>Binary files differ</td></tr>"); |
305 | html("<tr><td colspan='4'>Binary files differ</td></tr>"); |
304 | else |
306 | else |
305 | html("Binary files differ"); |
307 | html("Binary files differ"); |
@@ -353,11 +355,12 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefi |
353 | if (use_ssdiff) { |
355 | if (use_ssdiff) { |
354 | html("<table summary='ssdiff' class='ssdiff'>"); |
356 | html("<table summary='ssdiff' class='ssdiff'>"); |
355 | } else { |
357 | } else { |
356 | html("<table summary='diff' class='diff'>"); |
358 | html("<table summary='diff' class='diff'>"); |
357 | html("<tr><td>"); |
359 | html("<tr><td>"); |
358 | } |
360 | } |
359 | cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix); |
361 | cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix, |
| |
362 | ctx.qry.ignorews); |
360 | if (!use_ssdiff) |
363 | if (!use_ssdiff) |
361 | html("</td></tr>"); |
364 | html("</td></tr>"); |
362 | html("</table>"); |
365 | html("</table>"); |
363 | } |
366 | } |
|