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>

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
@@ -126,9 +126,9 @@ static void inspect_filepair(struct diff_filepair *pair)
         files++;
         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;
                 else
@@ -173,9 +173,10 @@ void cgit_print_diffstat(const unsigned char *old_sha1,
         html(" context)");
         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>");
         html("<div class='diffstat-summary'>");
@@ -295,9 +296,10 @@ static void filepair_cb(struct diff_filepair *pair)
                         cgit_ssdiff_footer();
                 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)
                         html("<tr><td colspan='4'>Binary files differ</td></tr>");
@@ -355,9 +357,10 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefi
         } else {
                 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>");
 }