|
diff --git a/cgit.h b/cgit.h index 4fe94c6..8b0defa 100644 --- a/ cgit.h+++ b/ cgit.h |
|
@@ -10,16 +10,17 @@ |
10 | #include <commit.h> |
10 | #include <commit.h> |
11 | #include <tag.h> |
11 | #include <tag.h> |
12 | #include <diff.h> |
12 | #include <diff.h> |
13 | #include <diffcore.h> |
13 | #include <diffcore.h> |
14 | #include <refs.h> |
14 | #include <refs.h> |
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 | |
21 | |
22 | |
22 | /* |
23 | /* |
23 | * Dateformats used on misc. pages |
24 | * Dateformats used on misc. pages |
24 | */ |
25 | */ |
25 | #define FMT_LONGDATE "%Y-%m-%d %H:%M:%S (%Z)" |
26 | #define FMT_LONGDATE "%Y-%m-%d %H:%M:%S (%Z)" |
@@ -216,17 +217,18 @@ extern char *strrpart(char *txt, int maxlen); |
216 | extern void cgit_add_ref(struct reflist *list, struct refinfo *ref); |
217 | extern void cgit_add_ref(struct reflist *list, struct refinfo *ref); |
217 | extern int cgit_refs_cb(const char *refname, const unsigned char *sha1, |
218 | extern int cgit_refs_cb(const char *refname, const unsigned char *sha1, |
218 | int flags, void *cb_data); |
219 | int flags, void *cb_data); |
219 | |
220 | |
220 | extern void *cgit_free_commitinfo(struct commitinfo *info); |
221 | 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, |
228 | filepair_fn fn, const char *prefix); |
230 | filepair_fn fn, const char *prefix); |
229 | |
231 | |
230 | extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); |
232 | extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); |
231 | |
233 | |
232 | extern char *fmt(const char *format,...); |
234 | extern char *fmt(const char *format,...); |
|
|
diff --git a/shared.c b/shared.c index 578a544..dbb84d8 100644 --- a/ shared.c+++ b/ shared.c |
|
@@ -252,27 +252,36 @@ int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf) |
252 | free(diffbuf); |
252 | free(diffbuf); |
253 | diffbuf = NULL; |
253 | diffbuf = NULL; |
254 | buflen = 0; |
254 | buflen = 0; |
255 | } |
255 | } |
256 | return 0; |
256 | return 0; |
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; |
265 | xdemitconf_t emit_params; |
265 | xdemitconf_t emit_params; |
266 | xdemitcb_t emit_cb; |
266 | xdemitcb_t emit_cb; |
267 | |
267 | |
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)); |
274 | diff_params.flags = XDF_NEED_MINIMAL; |
283 | diff_params.flags = XDF_NEED_MINIMAL; |
275 | emit_params.ctxlen = 3; |
284 | emit_params.ctxlen = 3; |
276 | emit_params.flags = XDL_EMIT_FUNCNAMES; |
285 | emit_params.flags = XDL_EMIT_FUNCNAMES; |
277 | emit_cb.outf = filediff_cb; |
286 | emit_cb.outf = filediff_cb; |
278 | emit_cb.priv = fn; |
287 | emit_cb.priv = fn; |
|
|
diff --git a/ui-diff.c b/ui-diff.c index 878496d..2196745 100644 --- a/ ui-diff.c+++ b/ ui-diff.c |
|
@@ -22,16 +22,19 @@ static struct fileinfo { |
22 | unsigned char old_sha1[20]; |
22 | unsigned char old_sha1[20]; |
23 | unsigned char new_sha1[20]; |
23 | unsigned char new_sha1[20]; |
24 | unsigned short old_mode; |
24 | unsigned short old_mode; |
25 | unsigned short new_mode; |
25 | unsigned short new_mode; |
26 | char *old_path; |
26 | char *old_path; |
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 | |
33 | static void print_fileinfo(struct fileinfo *info) |
36 | static void print_fileinfo(struct fileinfo *info) |
34 | { |
37 | { |
35 | char *class; |
38 | char *class; |
36 | |
39 | |
37 | switch (info->status) { |
40 | switch (info->status) { |
@@ -81,16 +84,21 @@ static void print_fileinfo(struct fileinfo *info) |
81 | htmlf("</td><td class='%s'>", class); |
84 | htmlf("</td><td class='%s'>", class); |
82 | cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.sha1, |
85 | cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.sha1, |
83 | ctx.qry.sha2, info->new_path); |
86 | ctx.qry.sha2, info->new_path); |
84 | if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED) |
87 | if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED) |
85 | htmlf(" (%s from %s)", |
88 | htmlf(" (%s from %s)", |
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)); |
92 | htmlf("<td class='add' style='width: %.1f%%;'/>", |
100 | htmlf("<td class='add' style='width: %.1f%%;'/>", |
93 | info->added * 100.0 / max_changes); |
101 | info->added * 100.0 / max_changes); |
94 | htmlf("<td class='rem' style='width: %.1f%%;'/>", |
102 | htmlf("<td class='rem' style='width: %.1f%%;'/>", |
95 | info->removed * 100.0 / max_changes); |
103 | info->removed * 100.0 / max_changes); |
96 | htmlf("<td class='none' style='width: %.1f%%;'/>", |
104 | htmlf("<td class='none' style='width: %.1f%%;'/>", |
@@ -105,36 +113,43 @@ static void count_diff_lines(char *line, int len) |
105 | lines_added++; |
113 | lines_added++; |
106 | else if (line[0] == '-') |
114 | else if (line[0] == '-') |
107 | lines_removed++; |
115 | lines_removed++; |
108 | } |
116 | } |
109 | } |
117 | } |
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; |
120 | else |
132 | else |
121 | slots = slots * 2; |
133 | slots = slots * 2; |
122 | items = xrealloc(items, slots * sizeof(struct fileinfo)); |
134 | items = xrealloc(items, slots * sizeof(struct fileinfo)); |
123 | } |
135 | } |
124 | items[files-1].status = pair->status; |
136 | items[files-1].status = pair->status; |
125 | hashcpy(items[files-1].old_sha1, pair->one->sha1); |
137 | hashcpy(items[files-1].old_sha1, pair->one->sha1); |
126 | hashcpy(items[files-1].new_sha1, pair->two->sha1); |
138 | hashcpy(items[files-1].new_sha1, pair->two->sha1); |
127 | items[files-1].old_mode = pair->one->mode; |
139 | items[files-1].old_mode = pair->one->mode; |
128 | items[files-1].new_mode = pair->two->mode; |
140 | items[files-1].new_mode = pair->two->mode; |
129 | items[files-1].old_path = xstrdup(pair->one->path); |
141 | items[files-1].old_path = xstrdup(pair->one->path); |
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; |
136 | total_rems += lines_removed; |
151 | total_rems += lines_removed; |
137 | } |
152 | } |
138 | |
153 | |
139 | void cgit_print_diffstat(const unsigned char *old_sha1, |
154 | void cgit_print_diffstat(const unsigned char *old_sha1, |
140 | const unsigned char *new_sha1) |
155 | const unsigned char *new_sha1) |
@@ -228,27 +243,34 @@ static void header(unsigned char *sha1, char *path1, int mode1, |
228 | else |
243 | else |
229 | html_txt(path2); |
244 | html_txt(path2); |
230 | } |
245 | } |
231 | html("</div>"); |
246 | html("</div>"); |
232 | } |
247 | } |
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)) { |
239 | if (S_ISGITLINK(pair->one->mode)) |
258 | if (S_ISGITLINK(pair->one->mode)) |
240 | print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52); |
259 | print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52); |
241 | if (S_ISGITLINK(pair->two->mode)) |
260 | if (S_ISGITLINK(pair->two->mode)) |
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) |
250 | { |
272 | { |
251 | enum object_type type; |
273 | enum object_type type; |
252 | unsigned long size; |
274 | unsigned long size; |
253 | struct commit *commit, *commit2; |
275 | struct commit *commit, *commit2; |
254 | |
276 | |
|
|
diff --git a/ui-log.c b/ui-log.c index 3202848..ba2ab03 100644 --- a/ ui-log.c+++ b/ ui-log.c |
|
@@ -21,19 +21,24 @@ void count_lines(char *line, int size) |
21 | add_lines++; |
21 | add_lines++; |
22 | |
22 | |
23 | else if (line[0] == '-') |
23 | else if (line[0] == '-') |
24 | rem_lines++; |
24 | rem_lines++; |
25 | } |
25 | } |
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) |
35 | { |
40 | { |
36 | struct name_decoration *deco; |
41 | struct name_decoration *deco; |
37 | static char buf[1024]; |
42 | static char buf[1024]; |
38 | |
43 | |
39 | buf[sizeof(buf) - 1] = 0; |
44 | buf[sizeof(buf) - 1] = 0; |
|
|
|
|
@@ -52,27 +52,34 @@ static void header(unsigned char *sha1, char *path1, int mode1, |
52 | } |
52 | } |
53 | htmlf("\n--- a/%s\n", path1); |
53 | htmlf("\n--- a/%s\n", path1); |
54 | htmlf("+++ b/%s\n", path2); |
54 | htmlf("+++ b/%s\n", path2); |
55 | } |
55 | } |
56 | } |
56 | } |
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)) { |
63 | if (S_ISGITLINK(pair->one->mode)) |
67 | if (S_ISGITLINK(pair->one->mode)) |
64 | print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52); |
68 | print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52); |
65 | if (S_ISGITLINK(pair->two->mode)) |
69 | if (S_ISGITLINK(pair->two->mode)) |
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) |
74 | { |
81 | { |
75 | struct commit *commit; |
82 | struct commit *commit; |
76 | struct commitinfo *info; |
83 | struct commitinfo *info; |
77 | unsigned char sha1[20], old_sha1[20]; |
84 | unsigned char sha1[20], old_sha1[20]; |
78 | char *patchname; |
85 | char *patchname; |
|