aboutsummaryrefslogtreecommitdiffstats
path: root/ui-diff.c
diff options
context:
space:
mode:
authorGravatar Lars Hjemli <hjemli@gmail.com>2010-07-18 22:03:30 (JST)
committerGravatar Lars Hjemli <hjemli@gmail.com>2010-07-18 22:03:30 (JST)
commit6821d8ea4a64d15b8f284d1af01ab184ef1e76c3 (patch)
treee9d2ea0555f801653cc9caa382e33afc7c5d804d /ui-diff.c
parent5c5d189635287a3bfaa1a4aef133dc0c582a27c2 (diff)
parent72ef913514288bd2aae23509581097bfd3edf8c4 (diff)
downloadcgit-6821d8ea4a64d15b8f284d1af01ab184ef1e76c3.zip
cgit-6821d8ea4a64d15b8f284d1af01ab184ef1e76c3.tar.gz
Merge branch 'jh/ignorews'
Diffstat (limited to 'ui-diff.c')
-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
@@ -127,7 +127,7 @@ static void inspect_filepair(struct diff_filepair *pair)
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;
@@ -171,10 +171,16 @@ 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(" (");
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>");
175 html("<table summary='diffstat' class='diffstat'>"); 180 html("<table summary='diffstat' class='diffstat'>");
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++)
179 print_fileinfo(&items[i]); 185 print_fileinfo(&items[i]);
180 html("</table>"); 186 html("</table>");
@@ -296,7 +302,8 @@ static void filepair_cb(struct diff_filepair *pair)
296 return; 302 return;
297 } 303 }
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");
301 if (binary) { 308 if (binary) {
302 if (use_ssdiff) 309 if (use_ssdiff)
@@ -356,7 +363,8 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefi
356 html("<table summary='diff' class='diff'>"); 363 html("<table summary='diff' class='diff'>");
357 html("<tr><td>"); 364 html("<tr><td>");
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)
361 html("</td></tr>"); 369 html("</td></tr>");
362 html("</table>"); 370 html("</table>");