Merge branch 'lh/binary'

1 files changed, 24 insertions, 2 deletions

diff --git a/ui-diff.c b/ui-diff.c
index 878496d..2196745 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -18,24 +18,27 @@ static int total_adds, total_rems, max_changes;
 static int lines_added, lines_removed;
 
 static struct fileinfo {
 	char status;
 	unsigned char old_sha1[20];
 	unsigned char new_sha1[20];
 	unsigned short old_mode;
 	unsigned short new_mode;
 	char *old_path;
 	char *new_path;
 	unsigned int added;
 	unsigned int removed;
+	unsigned long old_size;
+	unsigned long new_size;
+	int binary:1;
 } *items;
 
 
 static void print_fileinfo(struct fileinfo *info)
 {
 	char *class;
 
 	switch (info->status) {
 	case DIFF_STATUS_ADDED:
 		class = "add";
 		break;
 	case DIFF_STATUS_COPIED:
@@ -77,68 +80,80 @@ static void print_fileinfo(struct fileinfo *info)
 		html("<span class='modechange'>[");
 		cgit_print_filemode(info->old_mode);
 		html("]</span>");
 	}
 	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);
 	html("</td><td class='right'>");
+	if (info->binary) {
+		htmlf("bin</td><td class='graph'>%d -> %d bytes",
+		      info->old_size, info->new_size);
+		return;
+	}
 	htmlf("%d", info->added + info->removed);
 	html("</td><td class='graph'>");
 	htmlf("<table summary='file diffstat' width='%d%%'><tr>", (max_changes > 100 ? 100 : max_changes));
 	htmlf("<td class='add' style='width: %.1f%%;'/>",
 	      info->added * 100.0 / max_changes);
 	htmlf("<td class='rem' style='width: %.1f%%;'/>",
 	      info->removed * 100.0 / max_changes);
 	htmlf("<td class='none' style='width: %.1f%%;'/>",
 	      (max_changes - info->removed - info->added) * 100.0 / max_changes);
 	html("</tr></table></td></tr>\n");
 }
 
 static void count_diff_lines(char *line, int len)
 {
 	if (line && (len > 0)) {
 		if (line[0] == '+')
 			lines_added++;
 		else if (line[0] == '-')
 			lines_removed++;
 	}
 }
 
 static void inspect_filepair(struct diff_filepair *pair)
 {
+	int binary = 0;
+	unsigned long old_size = 0;
+	unsigned long new_size = 0;
 	files++;
 	lines_added = 0;
 	lines_removed = 0;
-	cgit_diff_files(pair->one->sha1, pair->two->sha1, count_diff_lines);
+	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'>");
@@ -224,35 +239,42 @@ static void header(unsigned char *sha1, char *path1, int mode1,
 		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 filepair_cb(struct diff_filepair *pair)
 {
+	unsigned long old_size = 0;
+	unsigned long new_size = 0;
+	int binary = 0;
+
 	header(pair->one->sha1, pair->one->path, pair->one->mode,
 	       pair->two->sha1, pair->two->path, pair->two->mode);
 	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);
 		if (S_ISGITLINK(pair->two->mode))
 			print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52);
 		return;
 	}
-	if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line))
+	if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, 
+			    &new_size, &binary, print_line))
 		cgit_print_error("Error running diff");
+	if (binary)
+		html("Binary files differ");
 }
 
 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);