Fixed side-by-side diff bugs related to binary diff and more.

The fixed bugs:

 * "Binary files differ" did not show up either in unidiff or
   side-by-side-diff.
 * Subproject diffs did not work for side-by-side diffs.
 * The ssdiff link on diff pages did not conserve the path.

Signed-off-by: Ragnar Ouchterlony <ragnar@lysator.liu.se>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>

2 files changed, 16 insertions, 6 deletions

diff --git a/ui-diff.c b/ui-diff.c
index b21c2c1..a92a768 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -128,220 +128,226 @@ 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, count_diff_lines);
 	if (files >= slots) {
 		if (slots == 0)
 			slots = 4;
 		else
 			slots = slots * 2;
 		items = xrealloc(items, slots * sizeof(struct fileinfo));
 	}
 	items[files-1].status = pair->status;
 	hashcpy(items[files-1].old_sha1, pair->one->sha1);
 	hashcpy(items[files-1].new_sha1, pair->two->sha1);
 	items[files-1].old_mode = pair->one->mode;
 	items[files-1].new_mode = pair->two->mode;
 	items[files-1].old_path = xstrdup(pair->one->path);
 	items[files-1].new_path = xstrdup(pair->two->path);
 	items[files-1].added = lines_added;
 	items[files-1].removed = lines_removed;
 	items[files-1].old_size = old_size;
 	items[files-1].new_size = new_size;
 	items[files-1].binary = binary;
 	if (lines_added + lines_removed > max_changes)
 		max_changes = lines_added + lines_removed;
 	total_adds += lines_added;
 	total_rems += lines_removed;
 }
 
 void cgit_print_diffstat(const unsigned char *old_sha1,
 			 const unsigned char *new_sha1)
 {
 	int i;
 
 	html("<div class='diffstat-header'>");
 	cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.sha1,
 		       ctx.qry.sha2, NULL, 0);
 	html("</div>");
 	html("<table summary='diffstat' class='diffstat'>");
 	max_changes = 0;
 	cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, NULL);
 	for(i = 0; i<files; i++)
 		print_fileinfo(&items[i]);
 	html("</table>");
 	html("<div class='diffstat-summary'>");
 	htmlf("%d files changed, %d insertions, %d deletions",
 	      files, total_adds, total_rems);
 	html("</div>");
 }
 
 
 /*
  * print a single line returned from xdiff
  */
 static void print_line(char *line, int len)
 {
 	char *class = "ctx";
 	char c = line[len-1];
 
 	if (line[0] == '+')
 		class = "add";
 	else if (line[0] == '-')
 		class = "del";
 	else if (line[0] == '@')
 		class = "hunk";
 
 	htmlf("<div class='%s'>", class);
 	line[len-1] = '\0';
 	html_txt(line);
 	html("</div>");
 	line[len-1] = c;
 }
 
 static void header(unsigned char *sha1, char *path1, int mode1,
 		   unsigned char *sha2, char *path2, int mode2)
 {
 	char *abbrev1, *abbrev2;
 	int subproject;
 
 	subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2));
 	html("<div class='head'>");
 	html("diff --git a/");
 	html_txt(path1);
 	html(" b/");
 	html_txt(path2);
 
 	if (is_null_sha1(sha1))
 		path1 = "dev/null";
 	if (is_null_sha1(sha2))
 		path2 = "dev/null";
 
 	if (mode1 == 0)
 		htmlf("<br/>new file mode %.6o", mode2);
 
 	if (mode2 == 0)
 		htmlf("<br/>deleted file mode %.6o", mode1);
 
 	if (!subproject) {
 		abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV));
 		abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV));
 		htmlf("<br/>index %s..%s", abbrev1, abbrev2);
 		free(abbrev1);
 		free(abbrev2);
 		if (mode1 != 0 && mode2 != 0) {
 			htmlf(" %.6o", mode1);
 			if (mode2 != mode1)
 				htmlf("..%.6o", mode2);
 		}
 		html("<br/>--- a/");
 		if (mode1 != 0)
 			cgit_tree_link(path1, NULL, NULL, ctx.qry.head,
 				       sha1_to_hex(old_rev_sha1), path1);
 		else
 			html_txt(path1);
 		html("<br/>+++ b/");
 		if (mode2 != 0)
 			cgit_tree_link(path2, NULL, NULL, ctx.qry.head,
 				       sha1_to_hex(new_rev_sha1), path2);
 		else
 			html_txt(path2);
 	}
 	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, NULL, 1);
+				       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, NULL, 1);
+				       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;
 
 	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_fn(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52);
 		if (S_ISGITLINK(pair->two->mode))
 			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_fn))
 		cgit_print_error("Error running diff");
-	if (binary)
-		print_line_fn(" Binary files differ", 20);
+	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)
 {
 	enum object_type type;
 	unsigned long size;
 	struct commit *commit, *commit2;
 
 	if (!new_rev)
 		new_rev = ctx.qry.head;
 	get_sha1(new_rev, new_rev_sha1);
 	type = sha1_object_info(new_rev_sha1, &size);
 	if (type == OBJ_BAD) {
 		cgit_print_error(fmt("Bad object name: %s", new_rev));
 		return;
 	}
 	commit = lookup_commit_reference(new_rev_sha1);
 	if (!commit || parse_commit(commit))
 		cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(new_rev_sha1)));
 
 	if (old_rev)
 		get_sha1(old_rev, old_rev_sha1);
 	else if (commit->parents && commit->parents->item)
 		hashcpy(old_rev_sha1, commit->parents->item->object.sha1);
 	else
 		hashclr(old_rev_sha1);
 
 	if (!is_null_sha1(old_rev_sha1)) {
 		type = sha1_object_info(old_rev_sha1, &size);
 		if (type == OBJ_BAD) {
 			cgit_print_error(fmt("Bad object name: %s", sha1_to_hex(old_rev_sha1)));
 			return;
 		}
 		commit2 = lookup_commit_reference(old_rev_sha1);
 		if (!commit2 || parse_commit(commit2))
 			cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(old_rev_sha1)));
 	}
 
 	if ((ctx.qry.ssdiff && !ctx.cfg.ssdiff) || (!ctx.qry.ssdiff && ctx.cfg.ssdiff))
 		use_ssdiff = 1;
 
 	print_ssdiff_link();
 	cgit_print_diffstat(old_rev_sha1, new_rev_sha1);
 
 	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);
 	if (!use_ssdiff)
 		html("</td></tr>");
 	html("</table>");
 }
diff --git a/ui-ssdiff.c b/ui-ssdiff.c
index 8215051..5673642 100644
--- a/ui-ssdiff.c
+++ b/ui-ssdiff.c
@@ -1,270 +1,274 @@
 #include "cgit.h"
 #include "html.h"
 #include "ui-shared.h"
 
 extern int use_ssdiff;
 
 static int current_old_line, current_new_line;
 
 struct deferred_lines {
 	int line_no;
 	char *line;
 	struct deferred_lines *next;
 };
 
 static struct deferred_lines *deferred_old, *deferred_old_last;
 static struct deferred_lines *deferred_new, *deferred_new_last;
 
 static int line_from_hunk(char *line, char type)
 {
 	char *buf1, *buf2;
 	int len;
 
 	buf1 = strchr(line, type);
 	if (buf1 == NULL)
 		return 0;
 	buf1 += 1;
 	buf2 = strchr(buf1, ',');
 	if (buf2 == NULL)
 		return 0;
 	len = buf2 - buf1;
 	buf2 = xmalloc(len + 1);
 	strncpy(buf2, buf1, len);
 	buf2[len] = '\0';
 	int res = atoi(buf2);
 	free(buf2);
 	return res;
 }
 
 static char *replace_tabs(char *line)
 {
 	char *prev_buf = line;
 	char *cur_buf;
 	int linelen = strlen(line);
 	int n_tabs = 0;
 	int i;
 	char *result;
 	char *spaces = "        ";
 
 	if (linelen == 0) {
 		result = xmalloc(1);
 		result[0] = '\0';
 		return result;
 	}
 
 	for (i = 0; i < linelen; i++)
 		if (line[i] == '\t')
 			n_tabs += 1;
 	result = xmalloc(linelen + n_tabs * 8 + 1);
 	result[0] = '\0';
 
 	while (1) {
 		cur_buf = strchr(prev_buf, '\t');
 		if (!cur_buf) {
 			strcat(result, prev_buf);
 			break;
 		} else {
 			strcat(result, " ");
 			strncat(result, spaces, 8 - (strlen(result) % 8));
 			strncat(result, prev_buf, cur_buf - prev_buf);
 		}
 		prev_buf = cur_buf + 1;
 	}
 	return result;
 }
 
 static void deferred_old_add(char *line, int line_no)
 {
 	struct deferred_lines *item = xmalloc(sizeof(struct deferred_lines));
 	item->line = xstrdup(line);
 	item->line_no = line_no;
 	item->next = NULL;
 	if (deferred_old) {
 		deferred_old_last->next = item;
 		deferred_old_last = item;
 	} else {
 		deferred_old = deferred_old_last = item;
 	}
 }
 
 static void deferred_new_add(char *line, int line_no)
 {
 	struct deferred_lines *item = xmalloc(sizeof(struct deferred_lines));
 	item->line = xstrdup(line);
 	item->line_no = line_no;
 	item->next = NULL;
 	if (deferred_new) {
 		deferred_new_last->next = item;
 		deferred_new_last = item;
 	} else {
 		deferred_new = deferred_new_last = item;
 	}
 }
 
 static void print_ssdiff_line(char *class, int old_line_no, char *old_line,
 			      int new_line_no, char *new_line)
 {
 	html("<tr>");
 	if (old_line_no > 0)
 		htmlf("<td class='lineno'>%d</td><td class='%s'>",
 		      old_line_no, class);
+	else if (old_line)
+		htmlf("<td class='lineno'></td><td class='%s'>", class);
 	else
 		htmlf("<td class='lineno'></td><td class='%s_dark'>", class);
 
 	if (old_line) {
 		old_line = replace_tabs(old_line + 1);
 		html_txt(old_line);
 		free(old_line);
 	}
 
 	html("</td>");
 
 	if (new_line_no > 0)
 		htmlf("<td class='lineno'>%d</td><td class='%s'>",
 		      new_line_no, class);
+	else if (new_line)
+		htmlf("<td class='lineno'></td><td class='%s'>", class);
 	else
 		htmlf("<td class='lineno'></td><td class='%s_dark'>", class);
 
 	if (new_line) {
 		new_line = replace_tabs(new_line + 1);
 		html_txt(new_line);
 		free(new_line);
 	}
 
 	html("</td></tr>");
 }
 
 static void print_deferred_old_lines()
 {
 	struct deferred_lines *iter_old, *tmp;
 
 	iter_old = deferred_old;
 	while (iter_old) {
 		print_ssdiff_line("del", iter_old->line_no,
 				  iter_old->line, -1, NULL);
 		tmp = iter_old->next;
 		free(iter_old);
 		iter_old = tmp;
 	}
 }
 
 static void print_deferred_new_lines()
 {
 	struct deferred_lines *iter_new, *tmp;
 
 	iter_new = deferred_new;
 	while (iter_new) {
 		print_ssdiff_line("add", -1, NULL, iter_new->line_no,
 				  iter_new->line);
 		tmp = iter_new->next;
 		free(iter_new);
 		iter_new = tmp;
 	}
 }
 
 static void print_deferred_changed_lines()
 {
 	struct deferred_lines *iter_old, *iter_new, *tmp;
 
 	iter_old = deferred_old;
 	iter_new = deferred_new;
 	while (iter_old || iter_new) {
 		if (iter_old && iter_new)
 			print_ssdiff_line("changed", iter_old->line_no,
 					  iter_old->line,
 					  iter_new->line_no, iter_new->line);
 		else if (iter_old)
 			print_ssdiff_line("changed", iter_old->line_no,
 					  iter_old->line, -1, NULL);
 		else if (iter_new)
 			print_ssdiff_line("changed", -1, NULL,
 					  iter_new->line_no, iter_new->line);
 
 		if (iter_old) {
 			tmp = iter_old->next;
 			free(iter_old);
 			iter_old = tmp;
 		}
 
 		if (iter_new) {
 			tmp = iter_new->next;
 			free(iter_new);
 			iter_new = tmp;
 		}
 	}
 }
 
 void cgit_ssdiff_print_deferred_lines()
 {
 	if (!deferred_old && !deferred_new)
 		return;
 
 	if (deferred_old && !deferred_new)
 		print_deferred_old_lines();
 	else if (!deferred_old && deferred_new)
 		print_deferred_new_lines();
 	else
 		print_deferred_changed_lines();
 
 	deferred_old = deferred_old_last = NULL;
 	deferred_new = deferred_new_last = NULL;
 }
 
 /*
  * print a single line returned from xdiff
  */
 void cgit_ssdiff_line_cb(char *line, int len)
 {
 	char c = line[len - 1];
 
 	line[len - 1] = '\0';
 
 	if (line[0] == '@') {
 		current_old_line = line_from_hunk(line, '-');
 		current_new_line = line_from_hunk(line, '+');
 	}
 
 	if (line[0] == ' ') {
 		if (deferred_old || deferred_new)
 			cgit_ssdiff_print_deferred_lines();
 		print_ssdiff_line("ctx", current_old_line, line,
 				  current_new_line, line);
 		current_old_line += 1;
 		current_new_line += 1;
 	} else if (line[0] == '+') {
 		deferred_new_add(line, current_new_line);
 		current_new_line += 1;
 	} else if (line[0] == '-') {
 		deferred_old_add(line, current_old_line);
 		current_old_line += 1;
 	} else if (line[0] == '@') {
 		html("<tr><td colspan='4' class='hunk'>");
 		html_txt(line);
 		html("</td></tr>");
 	} else {
 		html("<tr><td colspan='4' class='ctx'>");
 		html_txt(line);
 		html("</td></tr>");
 	}
 	line[len - 1] = c;
 }
 
 void cgit_ssdiff_header_begin()
 {
-	current_old_line = 0;
-	current_new_line = 0;
+	current_old_line = -1;
+	current_new_line = -1;
 	html("<tr><td class='space' colspan='4'><div></div></td></tr>");
 	html("<tr><td class='head' colspan='4'>");
 }
 
 void cgit_ssdiff_header_end()
 {
 	html("</td><tr>");
 }
 
 void cgit_ssdiff_footer()
 {
 	if (deferred_old || deferred_new)
 		cgit_ssdiff_print_deferred_lines();
 	html("<tr><td class='foot' colspan='4'></td></tr>");
 }