ui-diff: Add link to ignore/show whitespace changes in diffs

[ps-cgit] / ui-diff.c

diff --git a/ui-diff.c b/ui-diff.c
index d3a3b2c8bd04977232baa77004ec2e7015eb51b6..0dcabe90b9931e4b53e009a89b9853dcf3ab8c76 100644 (file)
--- 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,
        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;
        if (files >= slots) {
                if (slots == 0)
                        slots = 4;


@@ -156,17 +156,31 @@ static void inspect_filepair(struct diff_filepair *pair)
 void cgit_print_diffstat(const unsigned char *old_sha1,
                         const unsigned char *new_sha1, const char *prefix)
 {
 void cgit_print_diffstat(const unsigned char *old_sha1,
                         const unsigned char *new_sha1, const char *prefix)
 {

-       int i;
+       int i, save_context = ctx.qry.context;

 
        html("<div class='diffstat-header'>");
        cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.sha1,
                       ctx.qry.sha2, NULL, 0);
        if (prefix)
                htmlf(" (limited to '%s')", prefix);
 
        html("<div class='diffstat-header'>");
        cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.sha1,
                       ctx.qry.sha2, NULL, 0);
        if (prefix)
                htmlf(" (limited to '%s')", prefix);

+       html(" (");
+       ctx.qry.context = (save_context > 0 ? save_context : 3) << 1;
+       cgit_self_link("more", NULL, NULL, &ctx);
+       html("/");
+       ctx.qry.context = (save_context > 3 ? save_context : 3) >> 1;
+       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;
        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>");
        for(i = 0; i<files; i++)
                print_fileinfo(&items[i]);
        html("</table>");


@@ -288,7 +302,8 @@ static void filepair_cb(struct diff_filepair *pair)
                return;
        }
        if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,
                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)
                cgit_print_error("Error running diff");
        if (binary) {
                if (use_ssdiff)


@@ -348,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>");
        }
                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>");
        if (!use_ssdiff)
                html("</td></tr>");
        html("</table>");