|
diff --git a/cgit.h b/cgit.h index 4fe94c6..8b0defa 100644 --- a/ cgit.h+++ b/ cgit.h |
|
@@ -17,2 +17,3 @@ |
17 | #include <archive.h> |
17 | #include <archive.h> |
| |
18 | #include <xdiff-interface.h> |
18 | #include <xdiff/xdiff.h> |
19 | #include <xdiff/xdiff.h> |
@@ -223,3 +224,4 @@ extern int cgit_diff_files(const unsigned char *old_sha1, |
223 | const unsigned char *new_sha1, |
224 | const unsigned char *new_sha1, |
224 | linediff_fn fn); |
225 | unsigned long *old_size, unsigned long *new_size, |
| |
226 | int *binary, linediff_fn fn); |
225 | |
227 | |
|
|
diff --git a/shared.c b/shared.c index 578a544..dbb84d8 100644 --- a/ shared.c+++ b/ shared.c |
|
@@ -259,4 +259,4 @@ int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf) |
259 | int cgit_diff_files(const unsigned char *old_sha1, |
259 | int cgit_diff_files(const unsigned char *old_sha1, |
260 | const unsigned char *new_sha1, |
260 | const unsigned char *new_sha1, unsigned long *old_size, |
261 | linediff_fn fn) |
261 | unsigned long *new_size, int *binary, linediff_fn fn) |
262 | { |
262 | { |
@@ -270,2 +270,11 @@ int cgit_diff_files(const unsigned char *old_sha1, |
270 | |
270 | |
| |
271 | *old_size = file1.size; |
| |
272 | *new_size = file2.size; |
| |
273 | |
| |
274 | if (buffer_is_binary(file1.ptr, file1.size) || |
| |
275 | buffer_is_binary(file2.ptr, file2.size)) { |
| |
276 | *binary = 1; |
| |
277 | return 0; |
| |
278 | } |
| |
279 | |
271 | memset(&diff_params, 0, sizeof(diff_params)); |
280 | memset(&diff_params, 0, sizeof(diff_params)); |
|
|
diff --git a/ui-diff.c b/ui-diff.c index 878496d..2196745 100644 --- a/ ui-diff.c+++ b/ ui-diff.c |
|
@@ -29,2 +29,5 @@ static struct fileinfo { |
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; |
@@ -88,2 +91,7 @@ static void print_fileinfo(struct fileinfo *info) |
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); |
@@ -112,2 +120,5 @@ 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++; |
@@ -115,3 +126,4 @@ static void inspect_filepair(struct diff_filepair *pair) |
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) { |
@@ -132,2 +144,5 @@ static void inspect_filepair(struct diff_filepair *pair) |
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) |
@@ -235,2 +250,6 @@ 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, |
@@ -244,4 +263,7 @@ static void filepair_cb(struct diff_filepair *pair) |
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 | } |
|
|
diff --git a/ui-log.c b/ui-log.c index 3202848..ba2ab03 100644 --- a/ ui-log.c+++ b/ ui-log.c |
|
@@ -28,5 +28,10 @@ void inspect_files(struct diff_filepair *pair) |
28 | { |
28 | { |
| |
29 | unsigned long old_size = 0; |
| |
30 | unsigned long new_size = 0; |
| |
31 | int binary = 0; |
| |
32 | |
29 | files++; |
33 | files++; |
30 | if (ctx.repo->enable_log_linecount) |
34 | if (ctx.repo->enable_log_linecount) |
31 | cgit_diff_files(pair->one->sha1, pair->two->sha1, count_lines); |
35 | cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, |
| |
36 | &new_size, &binary, count_lines); |
32 | } |
37 | } |
|
|
|
|
@@ -59,2 +59,6 @@ static void filepair_cb(struct diff_filepair *pair) |
59 | { |
59 | { |
| |
60 | unsigned long old_size = 0; |
| |
61 | unsigned long new_size = 0; |
| |
62 | int binary = 0; |
| |
63 | |
60 | header(pair->one->sha1, pair->one->path, pair->one->mode, |
64 | header(pair->one->sha1, pair->one->path, pair->one->mode, |
@@ -68,4 +72,7 @@ static void filepair_cb(struct diff_filepair *pair) |
68 | } |
72 | } |
69 | if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line)) |
73 | if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, |
| |
74 | &new_size, &binary, print_line)) |
70 | html("Error running diff"); |
75 | html("Error running diff"); |
| |
76 | if (binary) |
| |
77 | html("Binary files differ\n"); |
71 | } |
78 | } |
|