|
diff --git a/ui-diff.c b/ui-diff.c index 878496d..2196745 100644 --- a/ ui-diff.c+++ b/ ui-diff.c |
|
@@ -27,6 +27,9 @@ static struct fileinfo { |
27 | char *new_path; |
27 | char *new_path; |
28 | unsigned int added; |
28 | unsigned int added; |
29 | unsigned int removed; |
29 | unsigned int removed; |
| |
30 | unsigned long old_size; |
| |
31 | unsigned long new_size; |
| |
32 | int binary:1; |
30 | } *items; |
33 | } *items; |
31 | |
34 | |
32 | |
35 | |
@@ -86,6 +89,11 @@ static void print_fileinfo(struct fileinfo *info) |
86 | info->status == DIFF_STATUS_COPIED ? "copied" : "renamed", |
89 | info->status == DIFF_STATUS_COPIED ? "copied" : "renamed", |
87 | info->old_path); |
90 | info->old_path); |
88 | html("</td><td class='right'>"); |
91 | html("</td><td class='right'>"); |
| |
92 | if (info->binary) { |
| |
93 | htmlf("bin</td><td class='graph'>%d -> %d bytes", |
| |
94 | info->old_size, info->new_size); |
| |
95 | return; |
| |
96 | } |
89 | htmlf("%d", info->added + info->removed); |
97 | htmlf("%d", info->added + info->removed); |
90 | html("</td><td class='graph'>"); |
98 | html("</td><td class='graph'>"); |
91 | htmlf("<table summary='file diffstat' width='%d%%'><tr>", (max_changes > 100 ? 100 : max_changes)); |
99 | htmlf("<table summary='file diffstat' width='%d%%'><tr>", (max_changes > 100 ? 100 : max_changes)); |
@@ -110,10 +118,14 @@ static void count_diff_lines(char *line, int len) |
110 | |
118 | |
111 | static void inspect_filepair(struct diff_filepair *pair) |
119 | static void inspect_filepair(struct diff_filepair *pair) |
112 | { |
120 | { |
| |
121 | int binary = 0; |
| |
122 | unsigned long old_size = 0; |
| |
123 | unsigned long new_size = 0; |
113 | files++; |
124 | files++; |
114 | lines_added = 0; |
125 | lines_added = 0; |
115 | lines_removed = 0; |
126 | lines_removed = 0; |
116 | cgit_diff_files(pair->one->sha1, pair->two->sha1, count_diff_lines); |
127 | cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, &new_size, |
| |
128 | &binary, count_diff_lines); |
117 | if (files >= slots) { |
129 | if (files >= slots) { |
118 | if (slots == 0) |
130 | if (slots == 0) |
119 | slots = 4; |
131 | slots = 4; |
@@ -130,6 +142,9 @@ static void inspect_filepair(struct diff_filepair *pair) |
130 | items[files-1].new_path = xstrdup(pair->two->path); |
142 | items[files-1].new_path = xstrdup(pair->two->path); |
131 | items[files-1].added = lines_added; |
143 | items[files-1].added = lines_added; |
132 | items[files-1].removed = lines_removed; |
144 | items[files-1].removed = lines_removed; |
| |
145 | items[files-1].old_size = old_size; |
| |
146 | items[files-1].new_size = new_size; |
| |
147 | items[files-1].binary = binary; |
133 | if (lines_added + lines_removed > max_changes) |
148 | if (lines_added + lines_removed > max_changes) |
134 | max_changes = lines_added + lines_removed; |
149 | max_changes = lines_added + lines_removed; |
135 | total_adds += lines_added; |
150 | total_adds += lines_added; |
@@ -233,6 +248,10 @@ static void header(unsigned char *sha1, char *path1, int mode1, |
233 | |
248 | |
234 | static void filepair_cb(struct diff_filepair *pair) |
249 | static void filepair_cb(struct diff_filepair *pair) |
235 | { |
250 | { |
| |
251 | unsigned long old_size = 0; |
| |
252 | unsigned long new_size = 0; |
| |
253 | int binary = 0; |
| |
254 | |
236 | header(pair->one->sha1, pair->one->path, pair->one->mode, |
255 | header(pair->one->sha1, pair->one->path, pair->one->mode, |
237 | pair->two->sha1, pair->two->path, pair->two->mode); |
256 | pair->two->sha1, pair->two->path, pair->two->mode); |
238 | if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) { |
257 | if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) { |
@@ -242,8 +261,11 @@ static void filepair_cb(struct diff_filepair *pair) |
242 | print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); |
261 | print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); |
243 | return; |
262 | return; |
244 | } |
263 | } |
245 | if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line)) |
264 | if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, |
| |
265 | &new_size, &binary, print_line)) |
246 | cgit_print_error("Error running diff"); |
266 | cgit_print_error("Error running diff"); |
| |
267 | if (binary) |
| |
268 | html("Binary files differ"); |
247 | } |
269 | } |
248 | |
270 | |
249 | void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefix) |
271 | void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefix) |
|