|
diff --git a/cgit.css b/cgit.css index 957d5aa..adfc8ae 100644 --- a/ cgit.css+++ b/ cgit.css |
|
@@ -262,8 +262,27 @@ table.blob a.no { |
262 | table.blob a.no a:hover { |
262 | table.blob a.no a:hover { |
263 | color: black; |
263 | color: black; |
264 | } |
264 | } |
265 | |
265 | |
| |
266 | table.bin-blob { |
| |
267 | margin-top: 0.5em; |
| |
268 | border: solid 1px black; |
| |
269 | } |
| |
270 | |
| |
271 | table.bin-blob th { |
| |
272 | font-family: monospace; |
| |
273 | white-space: pre; |
| |
274 | border: solid 1px #777; |
| |
275 | padding: 0.5em 1em; |
| |
276 | } |
| |
277 | |
| |
278 | table.bin-blob td { |
| |
279 | font-family: monospace; |
| |
280 | white-space: pre; |
| |
281 | border-left: solid 1px #777; |
| |
282 | padding: 0em 1em; |
| |
283 | } |
| |
284 | |
266 | table.nowrap td { |
285 | table.nowrap td { |
267 | white-space: nowrap; |
286 | white-space: nowrap; |
268 | } |
287 | } |
269 | |
288 | |
|
|
diff --git a/cgit.h b/cgit.h index 4942b96..5f7af51 100644 --- a/ cgit.h+++ b/ cgit.h |
|
@@ -14,8 +14,9 @@ |
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 | |
@@ -221,9 +222,10 @@ extern int cgit_refs_cb(const char *refname, const unsigned char *sha1, |
221 | extern void *cgit_free_commitinfo(struct commitinfo *info); |
222 | extern void *cgit_free_commitinfo(struct commitinfo *info); |
222 | |
223 | |
223 | extern int cgit_diff_files(const unsigned char *old_sha1, |
224 | extern int cgit_diff_files(const unsigned char *old_sha1, |
224 | const unsigned char *new_sha1, |
225 | const unsigned char *new_sha1, |
225 | linediff_fn fn); |
226 | unsigned long *old_size, unsigned long *new_size, |
| |
227 | int *binary, linediff_fn fn); |
226 | |
228 | |
227 | extern void cgit_diff_tree(const unsigned char *old_sha1, |
229 | extern void cgit_diff_tree(const unsigned char *old_sha1, |
228 | const unsigned char *new_sha1, |
230 | const unsigned char *new_sha1, |
229 | filepair_fn fn, const char *prefix); |
231 | filepair_fn fn, const char *prefix); |
|
|
diff --git a/shared.c b/shared.c index 578a544..cce0af4 100644 --- a/ shared.c+++ b/ shared.c |
|
@@ -256,10 +256,10 @@ int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf) |
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; |
@@ -267,8 +267,17 @@ int cgit_diff_files(const unsigned char *old_sha1, |
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 ((file1.ptr && buffer_is_binary(file1.ptr, file1.size)) || |
| |
275 | (file2.ptr && 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; |
|
|
diff --git a/ui-diff.c b/ui-diff.c index 878496d..2196745 100644 --- a/ ui-diff.c+++ b/ ui-diff.c |
|
@@ -26,8 +26,11 @@ static struct fileinfo { |
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) |
@@ -85,8 +88,13 @@ static void print_fileinfo(struct fileinfo *info) |
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%%;'/>", |
@@ -109,12 +117,16 @@ static void count_diff_lines(char *line, int len) |
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 |
@@ -129,8 +141,11 @@ static void inspect_filepair(struct diff_filepair *pair) |
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; |
@@ -232,8 +247,12 @@ static void header(unsigned char *sha1, char *path1, int mode1, |
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)) |
@@ -241,10 +260,13 @@ static void filepair_cb(struct diff_filepair *pair) |
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 | { |
|
|
diff --git a/ui-log.c b/ui-log.c index 3202848..ba2ab03 100644 --- a/ ui-log.c+++ b/ ui-log.c |
|
@@ -25,11 +25,16 @@ void count_lines(char *line, int size) |
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 | { |
|
|
|
|
@@ -56,8 +56,12 @@ static void header(unsigned char *sha1, char *path1, int mode1, |
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)) |
@@ -65,10 +69,13 @@ static void filepair_cb(struct diff_filepair *pair) |
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 | { |
|
|
diff --git a/ui-tree.c b/ui-tree.c index c26ba4c..a37a4e5 100644 --- a/ ui-tree.c+++ b/ ui-tree.c |
|
@@ -5,22 +5,64 @@ |
5 | * Licensed under GNU General Public License v2 |
5 | * Licensed under GNU General Public License v2 |
6 | * (see COPYING for full license text) |
6 | * (see COPYING for full license text) |
7 | */ |
7 | */ |
8 | |
8 | |
| |
9 | #include <ctype.h> |
9 | #include "cgit.h" |
10 | #include "cgit.h" |
10 | #include "html.h" |
11 | #include "html.h" |
11 | #include "ui-shared.h" |
12 | #include "ui-shared.h" |
12 | |
13 | |
13 | char *curr_rev; |
14 | char *curr_rev; |
14 | char *match_path; |
15 | char *match_path; |
15 | int header = 0; |
16 | int header = 0; |
16 | |
17 | |
| |
18 | static void print_text_buffer(char *buf, unsigned long size) |
| |
19 | { |
| |
20 | unsigned long lineno, idx; |
| |
21 | const char *numberfmt = |
| |
22 | "<a class='no' id='n%1$d' name='n%1$d' href='#n%1$d'>%1$d</a>\n"; |
| |
23 | |
| |
24 | html("<table summary='blob content' class='blob'>\n"); |
| |
25 | html("<tr><td class='linenumbers'><pre>"); |
| |
26 | idx = 0; |
| |
27 | lineno = 0; |
| |
28 | htmlf(numberfmt, ++lineno); |
| |
29 | while(idx < size - 1) { // skip absolute last newline |
| |
30 | if (buf[idx] == '\n') |
| |
31 | htmlf(numberfmt, ++lineno); |
| |
32 | idx++; |
| |
33 | } |
| |
34 | html("</pre></td>\n"); |
| |
35 | html("<td class='lines'><pre><code>"); |
| |
36 | html_txt(buf); |
| |
37 | html("</code></pre></td></tr></table>\n"); |
| |
38 | } |
| |
39 | |
| |
40 | static void print_binary_buffer(char *buf, unsigned long size) |
| |
41 | { |
| |
42 | unsigned long ofs, idx; |
| |
43 | |
| |
44 | html("<table summary='blob content' class='bin-blob'>\n"); |
| |
45 | html("<tr><th>ofs</th><th>hex dump</th><th>ascii</th></tr>"); |
| |
46 | for (ofs = 0; ofs < size; ofs += 32, buf += 32) { |
| |
47 | htmlf("<tr><td class='right'>%04x</td><td class='hex'>", ofs); |
| |
48 | for (idx = 0; idx < 32 && ofs + idx < size; idx++) |
| |
49 | htmlf("%*s%02x", |
| |
50 | idx == 16 ? 4 : 1, "", |
| |
51 | buf[idx] & 0xff); |
| |
52 | html(" </td><td class='hex'>"); |
| |
53 | for (idx = 0; idx < 32 && ofs + idx < size; idx++) |
| |
54 | htmlf("%c", isgraph(buf[idx]) ? buf[idx] : '.'); |
| |
55 | html("</td></tr>\n"); |
| |
56 | } |
| |
57 | html("</table>\n"); |
| |
58 | } |
| |
59 | |
17 | static void print_object(const unsigned char *sha1, char *path) |
60 | static void print_object(const unsigned char *sha1, char *path) |
18 | { |
61 | { |
19 | enum object_type type; |
62 | enum object_type type; |
20 | char *buf; |
63 | char *buf; |
21 | unsigned long size, lineno, idx; |
64 | unsigned long size; |
22 | const char *numberfmt = "<a class='no' id='n%1$d' name='n%1$d' href='#n%1$d'>%1$d</a>\n"; |
| |
23 | |
65 | |
24 | type = sha1_object_info(sha1, &size); |
66 | type = sha1_object_info(sha1, &size); |
25 | if (type == OBJ_BAD) { |
67 | if (type == OBJ_BAD) { |
26 | cgit_print_error(fmt("Bad object name: %s", |
68 | cgit_print_error(fmt("Bad object name: %s", |
@@ -39,29 +81,12 @@ static void print_object(const unsigned char *sha1, char *path) |
39 | cgit_plain_link("plain", NULL, NULL, ctx.qry.head, |
81 | cgit_plain_link("plain", NULL, NULL, ctx.qry.head, |
40 | curr_rev, path); |
82 | curr_rev, path); |
41 | htmlf(")<br/>blob: %s\n", sha1_to_hex(sha1)); |
83 | htmlf(")<br/>blob: %s\n", sha1_to_hex(sha1)); |
42 | |
84 | |
43 | html("<table summary='blob content' class='blob'>\n"); |
85 | if (buffer_is_binary(buf, size)) |
44 | html("<tr>\n"); |
86 | print_binary_buffer(buf, size); |
45 | |
87 | else |
46 | html("<td class='linenumbers'><pre>"); |
88 | print_text_buffer(buf, size); |
47 | idx = 0; |
| |
48 | lineno = 0; |
| |
49 | htmlf(numberfmt, ++lineno); |
| |
50 | while(idx < size - 1) { // skip absolute last newline |
| |
51 | if (buf[idx] == '\n') { |
| |
52 | htmlf(numberfmt, ++lineno); |
| |
53 | } |
| |
54 | idx++; |
| |
55 | } |
| |
56 | html("</pre></td>\n"); |
| |
57 | |
| |
58 | html("<td class='lines'><pre><code>"); |
| |
59 | html_txt(buf); |
| |
60 | html("</code></pre></td>\n"); |
| |
61 | |
| |
62 | html("</tr>\n"); |
| |
63 | html("</table>\n"); |
| |
64 | } |
89 | } |
65 | |
90 | |
66 | |
91 | |
67 | static int ls_item(const unsigned char *sha1, const char *base, int baselen, |
92 | static int ls_item(const unsigned char *sha1, const char *base, int baselen, |
|