aboutsummaryrefslogtreecommitdiffstats
path: root/ui-diff.c
diff options
context:
space:
mode:
authorJohan Herland <johan@herland.net>2010-06-24 17:52:57 +0200
committerLars Hjemli <hjemli@gmail.com>2010-07-18 10:53:48 +0200
commit2cc8b99f083014c58d8937bfa4dcd2bc47cd7e58 (patch)
tree48d555b15c0432bb98712d746100bf6c0fe2be4a /ui-diff.c
parentui-diff: Add links to increase/decrease number of context lines in diffs (diff)
downloadcgit-2cc8b99f083014c58d8937bfa4dcd2bc47cd7e58.tar.xz
cgit-2cc8b99f083014c58d8937bfa4dcd2bc47cd7e58.zip
Add URL parameter 'ignorews' for optionally ignoring whitespace in diffs
The new ctx.qry.ignorews variable is passed via cgit_diff_files() and cgit_diff_tree() to Git's diff machinery. This is equivalent to passing --ignore-all-space to 'git diff'. Signed-off-by: Johan Herland <johan@herland.net>
Diffstat (limited to 'ui-diff.c')
-rw-r--r--ui-diff.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/ui-diff.c b/ui-diff.c
index e0a72f7..1656b77 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -127,7 +127,7 @@ static void inspect_filepair(struct diff_filepair *pair)
lines_added = 0;
lines_removed = 0;
cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, &new_size,
- &binary, 0, count_diff_lines);
+ &binary, 0, ctx.qry.ignorews, count_diff_lines);
if (files >= slots) {
if (slots == 0)
slots = 4;
@@ -174,7 +174,8 @@ void cgit_print_diffstat(const unsigned char *old_sha1,
html("</div>");
html("<table summary='diffstat' class='diffstat'>");
max_changes = 0;
- cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, prefix);
+ cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, prefix,
+ ctx.qry.ignorews);
for(i = 0; i<files; i++)
print_fileinfo(&items[i]);
html("</table>");
@@ -296,7 +297,8 @@ static void filepair_cb(struct diff_filepair *pair)
return;
}
if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,
- &new_size, &binary, ctx.qry.context, print_line_fn))
+ &new_size, &binary, ctx.qry.context,
+ ctx.qry.ignorews, print_line_fn))
cgit_print_error("Error running diff");
if (binary) {
if (use_ssdiff)
@@ -356,7 +358,8 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefi
html("<table summary='diff' class='diff'>");
html("<tr><td>");
}
- cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix);
+ cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix,
+ ctx.qry.ignorews);
if (!use_ssdiff)
html("</td></tr>");
html("</table>");