diff options
| author | Johan Herland <johan@herland.net> | 2010-06-24 17:53:20 +0200 |
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2010-07-18 10:54:02 +0200 |
| commit | 72ef913514288bd2aae23509581097bfd3edf8c4 (patch) | |
| tree | 3a8b48aa0ebcc74a7e8b7f05f964432c6d577921 | |
| parent | Add URL parameter 'ignorews' for optionally ignoring whitespace in diffs (diff) | |
| download | cgit-pink-72ef913514288bd2aae23509581097bfd3edf8c4.tar.gz cgit-pink-72ef913514288bd2aae23509581097bfd3edf8c4.zip | |
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>
Diffstat (limited to '')
| -rw-r--r-- | ui-diff.c | 5 | ||||
| -rw-r--r-- | ui-shared.c | 10 |
2 files changed, 15 insertions, 0 deletions
diff --git a/ui-diff.c b/ui-diff.c index 1656b77..0dcabe9 100644 --- a/ui-diff.c +++ b/ui-diff.c @@ -171,6 +171,11 @@ 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; diff --git a/ui-shared.c b/ui-shared.c index c99bcec..f46c935 100644 --- a/ui-shared.c +++ b/ui-shared.c @@ -349,6 +349,11 @@ void cgit_commit_link(char *name, const char *title, const char *class, htmlf("%d", ctx.qry.context); delim = "&"; } + if (ctx.qry.ignorews) { + html(delim); + html("ignorews=1"); + delim = "&"; + } 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 = "&"; } + if (ctx.qry.ignorews) { + html(delim); + html("ignorews=1"); + delim = "&"; + } html("'>"); html_txt(name); html("</a>"); |