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
@@ -28,4 +28,7 @@ static struct fileinfo {
 	unsigned int added;
 	unsigned int removed;
+	unsigned long old_size;
+	unsigned long new_size;
+	int binary:1;
 } *items;
 
@@ -87,4 +90,9 @@ static void print_fileinfo(struct fileinfo *info)
 		      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'>");
@@ -111,8 +119,12 @@ static void count_diff_lines(char *line, int len)
 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)
@@ -131,4 +143,7 @@ static void inspect_filepair(struct diff_filepair *pair)
 	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;
@@ -234,4 +249,8 @@ static void header(unsigned char *sha1, char *path1, int mode1,
 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);
@@ -243,6 +262,9 @@ static void filepair_cb(struct diff_filepair *pair)
 		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");
 }