diff options
author | Johan Herland | 2010-06-24 17:53:20 +0200 |
---|---|---|
committer | Lars Hjemli | 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-72ef913514288bd2aae23509581097bfd3edf8c4.tar.gz cgit-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>
-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, | |||
171 | cgit_self_link("less", NULL, NULL, &ctx); | 171 | cgit_self_link("less", NULL, NULL, &ctx); |
172 | ctx.qry.context = save_context; | 172 | ctx.qry.context = save_context; |
173 | html(" context)"); | 173 | html(" context)"); |
174 | html(" ("); | ||
175 | ctx.qry.ignorews = (ctx.qry.ignorews + 1) % 2; | ||
176 | cgit_self_link(ctx.qry.ignorews ? "ignore" : "show", NULL, NULL, &ctx); | ||
177 | ctx.qry.ignorews = (ctx.qry.ignorews + 1) % 2; | ||
178 | html(" whitespace changes)"); | ||
174 | html("</div>"); | 179 | html("</div>"); |
175 | html("<table summary='diffstat' class='diffstat'>"); | 180 | html("<table summary='diffstat' class='diffstat'>"); |
176 | max_changes = 0; | 181 | 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, | |||
349 | htmlf("%d", ctx.qry.context); | 349 | htmlf("%d", ctx.qry.context); |
350 | delim = "&"; | 350 | delim = "&"; |
351 | } | 351 | } |
352 | if (ctx.qry.ignorews) { | ||
353 | html(delim); | ||
354 | html("ignorews=1"); | ||
355 | delim = "&"; | ||
356 | } | ||
352 | html("'>"); | 357 | html("'>"); |
353 | html_txt(name); | 358 | html_txt(name); |
354 | html("</a>"); | 359 | html("</a>"); |
@@ -397,6 +402,11 @@ void cgit_diff_link(const char *name, const char *title, const char *class, | |||
397 | htmlf("%d", ctx.qry.context); | 402 | htmlf("%d", ctx.qry.context); |
398 | delim = "&"; | 403 | delim = "&"; |
399 | } | 404 | } |
405 | if (ctx.qry.ignorews) { | ||
406 | html(delim); | ||
407 | html("ignorews=1"); | ||
408 | delim = "&"; | ||
409 | } | ||
400 | html("'>"); | 410 | html("'>"); |
401 | html_txt(name); | 411 | html_txt(name); |
402 | html("</a>"); | 412 | html("</a>"); |