summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.c2
-rw-r--r--cgit.h6
-rw-r--r--shared.c11
-rw-r--r--ui-diff.c16
-rw-r--r--ui-log.c3
-rw-r--r--ui-patch.c4
-rw-r--r--ui-shared.c10
7 files changed, 40 insertions, 12 deletions
diff --git a/cgit.c b/cgit.c
index fde0757..c263872 100644
--- a/cgit.c
+++ b/cgit.c
@@ -262,2 +262,4 @@ static void querystring_cb(const char *name, const char *value)
ctx.qry.context = atoi(value);
+ } else if (!strcmp(name, "ignorews")) {
+ ctx.qry.ignorews = atoi(value);
}
diff --git a/cgit.h b/cgit.h
index 2bf6ab0..e9e2718 100644
--- a/cgit.h
+++ b/cgit.h
@@ -150,2 +150,3 @@ struct cgit_query {
int context;
+ int ignorews;
char *vpath;
@@ -281,3 +282,4 @@ extern int cgit_diff_files(const unsigned char *old_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);
@@ -285,3 +287,3 @@ 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);
diff --git a/shared.c b/shared.c
index 9f7d6a5..b42c2a2 100644
--- a/shared.c
+++ b/shared.c
@@ -266,3 +266,3 @@ int cgit_diff_files(const unsigned char *old_sha1,
unsigned long *new_size, int *binary, int context,
- linediff_fn fn)
+ int ignorews, linediff_fn fn)
{
@@ -293,2 +293,4 @@ int cgit_diff_files(const unsigned char *old_sha1,
diff_params.flags = XDF_NEED_MINIMAL;
+ if (ignorews)
+ diff_params.flags |= XDF_IGNORE_WHITESPACE;
emit_params.ctxlen = context > 0 ? context : 3;
@@ -307,3 +309,3 @@ 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)
{
@@ -318,2 +320,4 @@ void cgit_diff_tree(const unsigned char *old_sha1,
DIFF_OPT_SET(&opt, RECURSIVE);
+ if (ignorews)
+ DIFF_XDL_SET(&opt, IGNORE_WHITESPACE);
opt.format_callback = cgit_diff_tree_cb;
@@ -342,3 +346,4 @@ void cgit_diff_commit(struct commit *commit, filepair_fn fn)
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);
}
diff --git a/ui-diff.c b/ui-diff.c
index e0a72f7..0dcabe9 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -129,3 +129,3 @@ static void inspect_filepair(struct diff_filepair *pair)
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) {
@@ -173,2 +173,7 @@ void cgit_print_diffstat(const unsigned char *old_sha1,
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>");
@@ -176,3 +181,4 @@ void cgit_print_diffstat(const unsigned char *old_sha1,
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++)
@@ -298,3 +304,4 @@ static void filepair_cb(struct diff_filepair *pair)
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");
@@ -358,3 +365,4 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefi
}
- 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)
diff --git a/ui-log.c b/ui-log.c
index 33ec8a9..ee93653 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -35,3 +35,4 @@ void inspect_files(struct diff_filepair *pair)
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);
}
diff --git a/ui-patch.c b/ui-patch.c
index d13104c..ca008f3 100644
--- a/ui-patch.c
+++ b/ui-patch.c
@@ -73,3 +73,3 @@ static void filepair_cb(struct diff_filepair *pair)
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");
@@ -126,3 +126,3 @@ void cgit_print_patch(char *hex, const char *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");
diff --git a/ui-shared.c b/ui-shared.c
index c398d7a..ae29615 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -351,2 +351,7 @@ void cgit_commit_link(char *name, const char *title, const char *class,
}
+ if (ctx.qry.ignorews) {
+ html(delim);
+ html("ignorews=1");
+ delim = "&amp;";
+ }
html("'>");
@@ -399,2 +404,7 @@ void cgit_diff_link(const char *name, const char *title, const char *class,
}
+ if (ctx.qry.ignorews) {
+ html(delim);
+ html("ignorews=1");
+ delim = "&amp;";
+ }
html("'>");