Merge branch 'jh/ignorews'

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
@@ -261,4 +261,6 @@ static void querystring_cb(const char *name, const char *value)
 	} else if (!strcmp(name, "context")) {
 		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
@@ -149,4 +149,5 @@ struct cgit_query {
 	int show_all;
 	int context;
+	int ignorews;
 	char *vpath;
 };
@@ -280,9 +281,10 @@ extern int cgit_diff_files(const unsigned char *old_sha1,
 			   const unsigned char *new_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);
 
 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);
 
 extern void cgit_diff_commit(struct commit *commit, filepair_fn fn);
diff --git a/shared.c b/shared.c
index 9f7d6a5..b42c2a2 100644
--- a/shared.c
+++ b/shared.c
@@ -265,5 +265,5 @@ int cgit_diff_files(const unsigned char *old_sha1,
 		    const unsigned char *new_sha1, unsigned long *old_size,
 		    unsigned long *new_size, int *binary, int context,
-		    linediff_fn fn)
+		    int ignorews, linediff_fn fn)
 {
 	mmfile_t file1, file2;
@@ -292,4 +292,6 @@ int cgit_diff_files(const unsigned char *old_sha1,
 	memset(&emit_cb, 0, sizeof(emit_cb));
 	diff_params.flags = XDF_NEED_MINIMAL;
+	if (ignorews)
+		diff_params.flags |= XDF_IGNORE_WHITESPACE;
 	emit_params.ctxlen = context > 0 ? context : 3;
 	emit_params.flags = XDL_EMIT_FUNCNAMES;
@@ -306,5 +308,5 @@ int cgit_diff_files(const unsigned char *old_sha1,
 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)
 {
 	struct diff_options opt;
@@ -317,4 +319,6 @@ void cgit_diff_tree(const unsigned char *old_sha1,
 	opt.rename_limit = ctx.cfg.renamelimit;
 	DIFF_OPT_SET(&opt, RECURSIVE);
+	if (ignorews)
+		DIFF_XDL_SET(&opt, IGNORE_WHITESPACE);
 	opt.format_callback = cgit_diff_tree_cb;
 	opt.format_callback_data = fn;
@@ -341,5 +345,6 @@ void cgit_diff_commit(struct commit *commit, filepair_fn fn)
 	if (commit->parents)
 		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
@@ -128,5 +128,5 @@ static void inspect_filepair(struct diff_filepair *pair)
 	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)
@@ -172,8 +172,14 @@ void cgit_print_diffstat(const unsigned char *old_sha1,
 	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);
+	cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, prefix,
+		       ctx.qry.ignorews);
 	for(i = 0; i<files; i++)
 		print_fileinfo(&items[i]);
@@ -297,5 +303,6 @@ 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");
 	if (binary) {
@@ -357,5 +364,6 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefi
 		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>");
diff --git a/ui-log.c b/ui-log.c
index 33ec8a9..ee93653 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -34,5 +34,6 @@ void inspect_files(struct diff_filepair *pair)
 	if (ctx.repo->enable_log_linecount)
 		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
@@ -72,5 +72,5 @@ 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");
 	if (binary)
@@ -125,5 +125,5 @@ void cgit_print_patch(char *hex, const char *prefix)
 	if (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");
 	htmlf("cgit %s\n", CGIT_VERSION);
diff --git a/ui-shared.c b/ui-shared.c
index c398d7a..ae29615 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -350,4 +350,9 @@ void cgit_commit_link(char *name, const char *title, const char *class,
 		delim = "&amp;";
 	}
+	if (ctx.qry.ignorews) {
+		html(delim);
+		html("ignorews=1");
+		delim = "&amp;";
+	}
 	html("'>");
 	html_txt(name);
@@ -398,4 +403,9 @@ void cgit_diff_link(const char *name, const char *title, const char *class,
 		delim = "&amp;";
 	}
+	if (ctx.qry.ignorews) {
+		html(delim);
+		html("ignorews=1");
+		delim = "&amp;";
+	}
 	html("'>");
 	html_txt(name);