author | Lars Hjemli <hjemli@gmail.com> | 2009-02-01 18:29:47 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-02-01 18:29:47 (UTC) |
commit | 5e447b1ed1aa751e8ec93dccf4df6fa4a7ffddb6 (patch) (unidiff) | |
tree | 823678b1c4a907cf0df50067c27fb5b752114df5 | |
parent | 0b3c746ba80738dbe0885a21406409390936537c (diff) | |
parent | 481ce5e298e2dcd7edc1d4a30e523dda2ce58b01 (diff) | |
download | cgit-5e447b1ed1aa751e8ec93dccf4df6fa4a7ffddb6.zip cgit-5e447b1ed1aa751e8ec93dccf4df6fa4a7ffddb6.tar.gz cgit-5e447b1ed1aa751e8ec93dccf4df6fa4a7ffddb6.tar.bz2 |
Merge branch 'lh/binary'
-rw-r--r-- | cgit.css | 19 | ||||
-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 | ||||
-rw-r--r-- | ui-tree.c | 71 |
7 files changed, 119 insertions, 30 deletions
@@ -265,2 +265,21 @@ table.blob a.no a:hover { | |||
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 { |
@@ -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> |
@@ -224,3 +225,4 @@ 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 | ||
@@ -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 ((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)); |
@@ -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 | } |
@@ -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 | } |
@@ -8,2 +8,3 @@ | |||
8 | 8 | ||
9 | #include <ctype.h> | ||
9 | #include "cgit.h" | 10 | #include "cgit.h" |
@@ -16,2 +17,44 @@ 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) |
@@ -20,4 +63,3 @@ static void print_object(const unsigned char *sha1, char *path) | |||
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 | ||
@@ -42,23 +84,6 @@ static void print_object(const unsigned char *sha1, char *path) | |||
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 | } |