Merge branch 'jh/ignorews'

7 files changed, 40 insertions, 12 deletions

@@ -260,6 +260,8 @@ static void querystring_cb(const char *name, const char *value)
                 ctx.qry.show_all = atoi(value);
         } else if (!strcmp(name, "context")) {
                 ctx.qry.context = atoi(value);
+        } else if (!strcmp(name, "ignorews")) {
+                ctx.qry.ignorews = atoi(value);
         }
 }
 
@@ -148,6 +148,7 @@ struct cgit_query {
         int ssdiff;
         int show_all;
         int context;
+        int ignorews;
         char *vpath;
 };
 
@@ -279,11 +280,12 @@ extern void *cgit_free_commitinfo(struct commitinfo *info);
 extern int cgit_diff_files(const unsigned char *old_sha1,
                            const unsigned char *new_sha1,
                            unsigned long *old_size, unsigned long *new_size,
-                           int *binary, int context, linediff_fn fn);
+                           int *binary, int context, int ignorews,
+                           linediff_fn fn);
 
 extern void cgit_diff_tree(const unsigned char *old_sha1,
                            const unsigned char *new_sha1,
-                           filepair_fn fn, const char *prefix);
+                           filepair_fn fn, const char *prefix, int ignorews);
 
 extern void cgit_diff_commit(struct commit *commit, filepair_fn fn);
 
@@ -264,7 +264,7 @@ int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf)
 int cgit_diff_files(const unsigned char *old_sha1,
                     const unsigned char *new_sha1, unsigned long *old_size,
                     unsigned long *new_size, int *binary, int context,
-                    linediff_fn fn)
+                    int ignorews, linediff_fn fn)
 {
         mmfile_t file1, file2;
         xpparam_t diff_params;
@@ -291,6 +291,8 @@ int cgit_diff_files(const unsigned char *old_sha1,
         memset(&emit_params, 0, sizeof(emit_params));
         memset(&emit_cb, 0, sizeof(emit_cb));
         diff_params.flags = XDF_NEED_MINIMAL;
+        if (ignorews)
+                diff_params.flags |= XDF_IGNORE_WHITESPACE;
         emit_params.ctxlen = context > 0 ? context : 3;
         emit_params.flags = XDL_EMIT_FUNCNAMES;
         emit_cb.outf = filediff_cb;
@@ -305,7 +307,7 @@ int cgit_diff_files(const unsigned char *old_sha1,
 
 void cgit_diff_tree(const unsigned char *old_sha1,
                     const unsigned char *new_sha1,
-                    filepair_fn fn, const char *prefix)
+                    filepair_fn fn, const char *prefix, int ignorews)
 {
         struct diff_options opt;
         int ret;
@@ -316,6 +318,8 @@ void cgit_diff_tree(const unsigned char *old_sha1,
         opt.detect_rename = 1;
         opt.rename_limit = ctx.cfg.renamelimit;
         DIFF_OPT_SET(&opt, RECURSIVE);
+        if (ignorews)
+                DIFF_XDL_SET(&opt, IGNORE_WHITESPACE);
         opt.format_callback = cgit_diff_tree_cb;
         opt.format_callback_data = fn;
         if (prefix) {
@@ -340,7 +344,8 @@ void cgit_diff_commit(struct commit *commit, filepair_fn fn)
 
         if (commit->parents)
                 old_sha1 = commit->parents->item->object.sha1;
-        cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL);
+        cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL,
+                       ctx.qry.ignorews);
 }
 
 int cgit_parse_snapshots_mask(const char *str)
@@ -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;
@@ -171,10 +171,16 @@ void cgit_print_diffstat(const unsigned char *old_sha1,
         cgit_self_link("less", NULL, NULL, &ctx);
         ctx.qry.context = save_context;
         html(" context)");
+        html(" (");
+        ctx.qry.ignorews = (ctx.qry.ignorews + 1) % 2;
+        cgit_self_link(ctx.qry.ignorews ? "ignore" : "show", NULL, NULL, &ctx);
+        ctx.qry.ignorews = (ctx.qry.ignorews + 1) % 2;
+        html(" whitespace changes)");
         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 +302,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 +363,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>");
@@ -33,7 +33,8 @@ void inspect_files(struct diff_filepair *pair)
         files++;
         if (ctx.repo->enable_log_linecount)
                 cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,
-                                &new_size, &binary, 0, count_lines);
+                                &new_size, &binary, 0, ctx.qry.ignorews,
+                                count_lines);
 }
 
 void show_commit_decorations(struct commit *commit)
@@ -71,7 +71,7 @@ static void filepair_cb(struct diff_filepair *pair)
                 return;
         }
         if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,
-                            &new_size, &binary, 0, print_line))
+                            &new_size, &binary, 0, 0, print_line))
                 html("Error running diff");
         if (binary)
                 html("Binary files differ\n");
@@ -124,7 +124,7 @@ void cgit_print_patch(char *hex, const char *prefix)
         html("---\n");
         if (prefix)
                 htmlf("(limited to '%s')\n\n", prefix);
-        cgit_diff_tree(old_sha1, sha1, filepair_cb, prefix);
+        cgit_diff_tree(old_sha1, sha1, filepair_cb, prefix, 0);
         html("--\n");
         htmlf("cgit %s\n", CGIT_VERSION);
         cgit_free_commitinfo(info);
@@ -349,6 +349,11 @@ void cgit_commit_link(char *name, const char *title, const char *class,
                 htmlf("%d", ctx.qry.context);
                 delim = "&amp;";
         }
+        if (ctx.qry.ignorews) {
+                html(delim);
+                html("ignorews=1");
+                delim = "&amp;";
+        }
         html("'>");
         html_txt(name);
         html("</a>");
@@ -397,6 +402,11 @@ void cgit_diff_link(const char *name, const char *title, const char *class,
                 htmlf("%d", ctx.qry.context);
                 delim = "&amp;";
         }
+        if (ctx.qry.ignorews) {
+                html(delim);
+                html("ignorews=1");
+                delim = "&amp;";
+        }
         html("'>");
         html_txt(name);
         html("</a>");