author | Lars Hjemli <hjemli@gmail.com> | 2009-01-31 09:40:40 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-01-31 09:40:40 (UTC) |
commit | c495cf02bac16e459f7c9e1740798646f12c00c5 (patch) (unidiff) | |
tree | a36ba3904edd96ffc79fdf420fb10d33117a469f | |
parent | d6174b7aab476c2b6a86e59d98cf978d603045f4 (diff) | |
download | cgit-c495cf02bac16e459f7c9e1740798646f12c00c5.zip cgit-c495cf02bac16e459f7c9e1740798646f12c00c5.tar.gz cgit-c495cf02bac16e459f7c9e1740798646f12c00c5.tar.bz2 |
Handle binary files in diffs
This teaches all diff-related operations (i.e. ui-log, ui-diff and ui-patch)
how to handle binary files.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.h | 4 | ||||
-rw-r--r-- | shared.c | 13 | ||||
-rw-r--r-- | ui-diff.c | 26 | ||||
-rw-r--r-- | ui-log.c | 7 | ||||
-rw-r--r-- | ui-patch.c | 9 |
5 files changed, 52 insertions, 7 deletions
@@ -15,6 +15,7 @@ | |||
15 | #include <revision.h> | 15 | #include <revision.h> |
16 | #include <log-tree.h> | 16 | #include <log-tree.h> |
17 | #include <archive.h> | 17 | #include <archive.h> |
18 | #include <xdiff-interface.h> | ||
18 | #include <xdiff/xdiff.h> | 19 | #include <xdiff/xdiff.h> |
19 | #include <utf8.h> | 20 | #include <utf8.h> |
20 | 21 | ||
@@ -221,7 +222,8 @@ extern void *cgit_free_commitinfo(struct commitinfo *info); | |||
221 | 222 | ||
222 | extern int cgit_diff_files(const unsigned char *old_sha1, | 223 | 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 | ||
226 | extern void cgit_diff_tree(const unsigned char *old_sha1, | 228 | extern void cgit_diff_tree(const unsigned char *old_sha1, |
227 | const unsigned char *new_sha1, | 229 | const unsigned char *new_sha1, |
@@ -257,8 +257,8 @@ int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf) | |||
257 | } | 257 | } |
258 | 258 | ||
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 | { |
263 | mmfile_t file1, file2; | 263 | mmfile_t file1, file2; |
264 | xpparam_t diff_params; | 264 | xpparam_t diff_params; |
@@ -268,6 +268,15 @@ int cgit_diff_files(const unsigned char *old_sha1, | |||
268 | if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1)) | 268 | if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1)) |
269 | return 1; | 269 | return 1; |
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)); |
272 | memset(&emit_params, 0, sizeof(emit_params)); | 281 | memset(&emit_params, 0, sizeof(emit_params)); |
273 | memset(&emit_cb, 0, sizeof(emit_cb)); | 282 | memset(&emit_cb, 0, sizeof(emit_cb)); |
@@ -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) |
@@ -26,9 +26,14 @@ void count_lines(char *line, int size) | |||
26 | 26 | ||
27 | void inspect_files(struct diff_filepair *pair) | 27 | 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 | } |
33 | 38 | ||
34 | void show_commit_decorations(struct commit *commit) | 39 | void show_commit_decorations(struct commit *commit) |
@@ -57,6 +57,10 @@ static void header(unsigned char *sha1, char *path1, int mode1, | |||
57 | 57 | ||
58 | static void filepair_cb(struct diff_filepair *pair) | 58 | 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, |
61 | pair->two->sha1, pair->two->path, pair->two->mode); | 65 | pair->two->sha1, pair->two->path, pair->two->mode); |
62 | if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) { | 66 | if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) { |
@@ -66,8 +70,11 @@ static void filepair_cb(struct diff_filepair *pair) | |||
66 | print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); | 70 | print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); |
67 | return; | 71 | return; |
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 | } |
72 | 79 | ||
73 | void cgit_print_patch(char *hex) | 80 | void cgit_print_patch(char *hex) |