X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/5e447b1ed1aa751e8ec93dccf4df6fa4a7ffddb6..f50be7fda0a7ab57009169dd5905fcbab8eb5166:/ui-diff.c

diff --git a/ui-diff.c b/ui-diff.c
index 2196745..f8782df 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -9,6 +9,7 @@
 #include "cgit.h"
 #include "html.h"
 #include "ui-shared.h"
+#include "ui-ssdiff.h"
 
 unsigned char old_rev_sha1[20];
 unsigned char new_rev_sha1[20];
@@ -32,6 +33,18 @@ static struct fileinfo {
 	int binary:1;
 } *items;
 
+static int use_ssdiff = 0;
+static struct diff_filepair *current_filepair;
+
+struct diff_filespec *cgit_get_current_old_file(void)
+{
+	return current_filepair->one;
+}
+
+struct diff_filespec *cgit_get_current_new_file(void)
+{
+	return current_filepair->two;
+}
 
 static void print_fileinfo(struct fileinfo *info)
 {
@@ -83,14 +96,16 @@ static void print_fileinfo(struct fileinfo *info)
 	}
 	htmlf("</td><td class='%s'>", class);
 	cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.sha1,
-		       ctx.qry.sha2, info->new_path);
-	if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED)
-		htmlf(" (%s from %s)",
-		      info->status == DIFF_STATUS_COPIED ? "copied" : "renamed",
-		      info->old_path);
+		       ctx.qry.sha2, info->new_path, 0);
+	if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED) {
+		htmlf(" (%s from ",
+		      info->status == DIFF_STATUS_COPIED ? "copied" : "renamed");
+		html_txt(info->old_path);
+		html(")");
+	}
 	html("</td><td class='right'>");
 	if (info->binary) {
-		htmlf("bin</td><td class='graph'>%d -> %d bytes",
+		htmlf("bin</td><td class='graph'>%ld -> %ld bytes",
 		      info->old_size, info->new_size);
 		return;
 	}
@@ -125,7 +140,7 @@ static void inspect_filepair(struct diff_filepair *pair)
 	lines_added = 0;
 	lines_removed = 0;
 	cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, &new_size,
-			&binary, count_diff_lines);
+			&binary, 0, ctx.qry.ignorews, count_diff_lines);
 	if (files >= slots) {
 		if (slots == 0)
 			slots = 4;
@@ -152,17 +167,36 @@ static void inspect_filepair(struct diff_filepair *pair)
 }
 
 void cgit_print_diffstat(const unsigned char *old_sha1,
-			 const unsigned char *new_sha1)
+			 const unsigned char *new_sha1, const char *prefix)
 {
-	int i;
+	int i, save_context = ctx.qry.context;
 
 	html("<div class='diffstat-header'>");
 	cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.sha1,
-		       ctx.qry.sha2, NULL);
+		       ctx.qry.sha2, NULL, 0);
+	if (prefix) {
+		html(" (limited to '");
+		html_txt(prefix);
+		html("')");
+	}
+	html(" (");
+	ctx.qry.context = (save_context > 0 ? save_context : 3) << 1;
+	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, NULL);
+	cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, prefix,
+		       ctx.qry.ignorews);
 	for(i = 0; i<files; i++)
 		print_fileinfo(&items[i]);
 	html("</table>");
@@ -246,26 +280,56 @@ static void header(unsigned char *sha1, char *path1, int mode1,
 	html("</div>");
 }
 
+static void print_ssdiff_link()
+{
+	if (!strcmp(ctx.qry.page, "diff")) {
+		if (use_ssdiff)
+			cgit_diff_link("Unidiff", NULL, NULL, ctx.qry.head,
+				       ctx.qry.sha1, ctx.qry.sha2, ctx.qry.path, 1);
+		else
+			cgit_diff_link("Side-by-side diff", NULL, NULL,
+				       ctx.qry.head, ctx.qry.sha1,
+				       ctx.qry.sha2, ctx.qry.path, 1);
+	}
+}
+
 static void filepair_cb(struct diff_filepair *pair)
 {
 	unsigned long old_size = 0;
 	unsigned long new_size = 0;
 	int binary = 0;
+	linediff_fn print_line_fn = print_line;
 
+	current_filepair = pair;
+	if (use_ssdiff) {
+		cgit_ssdiff_header_begin();
+		print_line_fn = cgit_ssdiff_line_cb;
+	}
 	header(pair->one->sha1, pair->one->path, pair->one->mode,
 	       pair->two->sha1, pair->two->path, pair->two->mode);
+	if (use_ssdiff)
+		cgit_ssdiff_header_end();
 	if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) {
 		if (S_ISGITLINK(pair->one->mode))
-			print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52);
+			print_line_fn(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52);
 		if (S_ISGITLINK(pair->two->mode))
-			print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52);
+			print_line_fn(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52);
+		if (use_ssdiff)
+			cgit_ssdiff_footer();
 		return;
 	}
-	if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, 
-			    &new_size, &binary, print_line))
+	if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,
+			    &new_size, &binary, ctx.qry.context,
+			    ctx.qry.ignorews, print_line_fn))
 		cgit_print_error("Error running diff");
-	if (binary)
-		html("Binary files differ");
+	if (binary) {
+		if (use_ssdiff)
+			html("<tr><td colspan='4'>Binary files differ</td></tr>");
+		else
+			html("Binary files differ");
+	}
+	if (use_ssdiff)
+		cgit_ssdiff_footer();
 }
 
 void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefix)
@@ -283,8 +347,10 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefi
 		return;
 	}
 	commit = lookup_commit_reference(new_rev_sha1);
-	if (!commit || parse_commit(commit))
+	if (!commit || parse_commit(commit)) {
 		cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(new_rev_sha1)));
+		return;
+	}
 
 	if (old_rev)
 		get_sha1(old_rev, old_rev_sha1);
@@ -300,14 +366,26 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefi
 			return;
 		}
 		commit2 = lookup_commit_reference(old_rev_sha1);
-		if (!commit2 || parse_commit(commit2))
+		if (!commit2 || parse_commit(commit2)) {
 			cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(old_rev_sha1)));
+			return;
+		}
 	}
-	cgit_print_diffstat(old_rev_sha1, new_rev_sha1);
 
-	html("<table summary='diff' class='diff'>");
-	html("<tr><td>");
-	cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix);
-	html("</td></tr>");
+	use_ssdiff = ctx.qry.has_ssdiff ? ctx.qry.ssdiff : ctx.cfg.ssdiff;
+
+	print_ssdiff_link();
+	cgit_print_diffstat(old_rev_sha1, new_rev_sha1, prefix);
+
+	if (use_ssdiff) {
+		html("<table summary='ssdiff' class='ssdiff'>");
+	} else {
+		html("<table summary='diff' class='diff'>");
+		html("<tr><td>");
+	}
+	cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix,
+		       ctx.qry.ignorews);
+	if (!use_ssdiff)
+		html("</td></tr>");
 	html("</table>");
 }