summaryrefslogtreecommitdiffabout
path: root/ui-diff.c
Unidiff
Diffstat (limited to 'ui-diff.c') (more/less context) (ignore whitespace changes)
-rw-r--r--ui-diff.c16
1 files changed, 12 insertions, 4 deletions
diff --git a/ui-diff.c b/ui-diff.c
index e0a72f7..0dcabe9 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -129,3 +129,3 @@ static void inspect_filepair(struct diff_filepair *pair)
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) {
@@ -173,2 +173,7 @@ void cgit_print_diffstat(const unsigned char *old_sha1,
173 html(" context)"); 173 html(" context)");
174 html(" (");
175 ctx.qry.ignorews = (ctx.qry.ignorews + 1) % 2;
176 cgit_self_link(ctx.qry.ignorews ? "ignore" : "show", NULL, NULL, &ctx);
177 ctx.qry.ignorews = (ctx.qry.ignorews + 1) % 2;
178 html(" whitespace changes)");
174 html("</div>"); 179 html("</div>");
@@ -176,3 +181,4 @@ void cgit_print_diffstat(const unsigned char *old_sha1,
176 max_changes = 0; 181 max_changes = 0;
177 cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, prefix); 182 cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, prefix,
183 ctx.qry.ignorews);
178 for(i = 0; i<files; i++) 184 for(i = 0; i<files; i++)
@@ -298,3 +304,4 @@ static void filepair_cb(struct diff_filepair *pair)
298 if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, 304 if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,
299 &new_size, &binary, ctx.qry.context, print_line_fn)) 305 &new_size, &binary, ctx.qry.context,
306 ctx.qry.ignorews, print_line_fn))
300 cgit_print_error("Error running diff"); 307 cgit_print_error("Error running diff");
@@ -358,3 +365,4 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefi
358 } 365 }
359 cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix); 366 cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix,
367 ctx.qry.ignorews);
360 if (!use_ssdiff) 368 if (!use_ssdiff)