| author | Johan Herland <johan@herland.net> | 2010-06-24 15:53:20 (UTC) |
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2010-07-18 08:54:02 (UTC) |
| commit | 72ef913514288bd2aae23509581097bfd3edf8c4 (patch) (side-by-side diff) | |
| tree | 3a8b48aa0ebcc74a7e8b7f05f964432c6d577921 | |
| parent | 2cc8b99f083014c58d8937bfa4dcd2bc47cd7e58 (diff) | |
| download | cgit-72ef913514288bd2aae23509581097bfd3edf8c4.zip cgit-72ef913514288bd2aae23509581097bfd3edf8c4.tar.gz cgit-72ef913514288bd2aae23509581097bfd3edf8c4.tar.bz2 | |
ui-diff: Add link to ignore/show whitespace changes in diffs
Add a link to the "Diffstat" line to ignore/show whitespace changes in the
generated diff.
To support this, cgit_commit_link() and cgit_diff_link() has learned to
preserve the ctx.qry.ignorews variable.
Signed-off-by: Johan Herland <johan@herland.net>
| -rw-r--r-- | ui-diff.c | 5 | ||||
| -rw-r--r-- | ui-shared.c | 10 |
2 files changed, 15 insertions, 0 deletions
@@ -168,12 +168,17 @@ void cgit_print_diffstat(const unsigned char *old_sha1, 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; cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, prefix, ctx.qry.ignorews); for(i = 0; i<files; i++) diff --git a/ui-shared.c b/ui-shared.c index c99bcec..f46c935 100644 --- a/ui-shared.c +++ b/ui-shared.c @@ -346,12 +346,17 @@ void cgit_commit_link(char *name, const char *title, const char *class, if (ctx.qry.context > 0 && ctx.qry.context != 3) { html(delim); html("context="); htmlf("%d", ctx.qry.context); delim = "&"; } + if (ctx.qry.ignorews) { + html(delim); + html("ignorews=1"); + delim = "&"; + } html("'>"); html_txt(name); html("</a>"); } void cgit_refs_link(const char *name, const char *title, const char *class, @@ -394,12 +399,17 @@ void cgit_diff_link(const char *name, const char *title, const char *class, if (ctx.qry.context > 0 && ctx.qry.context != 3) { html(delim); html("context="); htmlf("%d", ctx.qry.context); delim = "&"; } + if (ctx.qry.ignorews) { + html(delim); + html("ignorews=1"); + delim = "&"; + } html("'>"); html_txt(name); html("</a>"); } void cgit_patch_link(const char *name, const char *title, const char *class, |