|
diff --git a/ui-diff.c b/ui-diff.c index 2196745..a92a768 100644 --- a/ ui-diff.c+++ b/ ui-diff.c |
|
@@ -1,46 +1,48 @@ |
1 | /* ui-diff.c: show diff between two blobs |
1 | /* ui-diff.c: show diff between two blobs |
2 | * |
2 | * |
3 | * Copyright (C) 2006 Lars Hjemli |
3 | * Copyright (C) 2006 Lars Hjemli |
4 | * |
4 | * |
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 "cgit.h" |
9 | #include "cgit.h" |
10 | #include "html.h" |
10 | #include "html.h" |
11 | #include "ui-shared.h" |
11 | #include "ui-shared.h" |
| |
12 | #include "ui-ssdiff.h" |
12 | |
13 | |
13 | unsigned char old_rev_sha1[20]; |
14 | unsigned char old_rev_sha1[20]; |
14 | unsigned char new_rev_sha1[20]; |
15 | unsigned char new_rev_sha1[20]; |
15 | |
16 | |
16 | static int files, slots; |
17 | static int files, slots; |
17 | static int total_adds, total_rems, max_changes; |
18 | static int total_adds, total_rems, max_changes; |
18 | static int lines_added, lines_removed; |
19 | static int lines_added, lines_removed; |
19 | |
20 | |
20 | static struct fileinfo { |
21 | static struct fileinfo { |
21 | char status; |
22 | char status; |
22 | unsigned char old_sha1[20]; |
23 | unsigned char old_sha1[20]; |
23 | unsigned char new_sha1[20]; |
24 | unsigned char new_sha1[20]; |
24 | unsigned short old_mode; |
25 | unsigned short old_mode; |
25 | unsigned short new_mode; |
26 | unsigned short new_mode; |
26 | char *old_path; |
27 | char *old_path; |
27 | char *new_path; |
28 | char *new_path; |
28 | unsigned int added; |
29 | unsigned int added; |
29 | unsigned int removed; |
30 | unsigned int removed; |
30 | unsigned long old_size; |
31 | unsigned long old_size; |
31 | unsigned long new_size; |
32 | unsigned long new_size; |
32 | int binary:1; |
33 | int binary:1; |
33 | } *items; |
34 | } *items; |
34 | |
35 | |
| |
36 | static int use_ssdiff = 0; |
35 | |
37 | |
36 | static void print_fileinfo(struct fileinfo *info) |
38 | static void print_fileinfo(struct fileinfo *info) |
37 | { |
39 | { |
38 | char *class; |
40 | char *class; |
39 | |
41 | |
40 | switch (info->status) { |
42 | switch (info->status) { |
41 | case DIFF_STATUS_ADDED: |
43 | case DIFF_STATUS_ADDED: |
42 | class = "add"; |
44 | class = "add"; |
43 | break; |
45 | break; |
44 | case DIFF_STATUS_COPIED: |
46 | case DIFF_STATUS_COPIED: |
45 | class = "cpy"; |
47 | class = "cpy"; |
46 | break; |
48 | break; |
@@ -74,25 +76,25 @@ static void print_fileinfo(struct fileinfo *info) |
74 | cgit_print_filemode(info->new_mode); |
76 | cgit_print_filemode(info->new_mode); |
75 | } |
77 | } |
76 | |
78 | |
77 | if (info->old_mode != info->new_mode && |
79 | if (info->old_mode != info->new_mode && |
78 | !is_null_sha1(info->old_sha1) && |
80 | !is_null_sha1(info->old_sha1) && |
79 | !is_null_sha1(info->new_sha1)) { |
81 | !is_null_sha1(info->new_sha1)) { |
80 | html("<span class='modechange'>["); |
82 | html("<span class='modechange'>["); |
81 | cgit_print_filemode(info->old_mode); |
83 | cgit_print_filemode(info->old_mode); |
82 | html("]</span>"); |
84 | html("]</span>"); |
83 | } |
85 | } |
84 | htmlf("</td><td class='%s'>", class); |
86 | htmlf("</td><td class='%s'>", class); |
85 | cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.sha1, |
87 | cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.sha1, |
86 | ctx.qry.sha2, info->new_path); |
88 | ctx.qry.sha2, info->new_path, 0); |
87 | if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED) |
89 | if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED) |
88 | htmlf(" (%s from %s)", |
90 | htmlf(" (%s from %s)", |
89 | info->status == DIFF_STATUS_COPIED ? "copied" : "renamed", |
91 | info->status == DIFF_STATUS_COPIED ? "copied" : "renamed", |
90 | info->old_path); |
92 | info->old_path); |
91 | html("</td><td class='right'>"); |
93 | html("</td><td class='right'>"); |
92 | if (info->binary) { |
94 | if (info->binary) { |
93 | htmlf("bin</td><td class='graph'>%d -> %d bytes", |
95 | htmlf("bin</td><td class='graph'>%d -> %d bytes", |
94 | info->old_size, info->new_size); |
96 | info->old_size, info->new_size); |
95 | return; |
97 | return; |
96 | } |
98 | } |
97 | htmlf("%d", info->added + info->removed); |
99 | htmlf("%d", info->added + info->removed); |
98 | html("</td><td class='graph'>"); |
100 | html("</td><td class='graph'>"); |
@@ -149,25 +151,25 @@ static void inspect_filepair(struct diff_filepair *pair) |
149 | max_changes = lines_added + lines_removed; |
151 | max_changes = lines_added + lines_removed; |
150 | total_adds += lines_added; |
152 | total_adds += lines_added; |
151 | total_rems += lines_removed; |
153 | total_rems += lines_removed; |
152 | } |
154 | } |
153 | |
155 | |
154 | void cgit_print_diffstat(const unsigned char *old_sha1, |
156 | void cgit_print_diffstat(const unsigned char *old_sha1, |
155 | const unsigned char *new_sha1) |
157 | const unsigned char *new_sha1) |
156 | { |
158 | { |
157 | int i; |
159 | int i; |
158 | |
160 | |
159 | html("<div class='diffstat-header'>"); |
161 | html("<div class='diffstat-header'>"); |
160 | cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.sha1, |
162 | cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.sha1, |
161 | ctx.qry.sha2, NULL); |
163 | ctx.qry.sha2, NULL, 0); |
162 | html("</div>"); |
164 | html("</div>"); |
163 | html("<table summary='diffstat' class='diffstat'>"); |
165 | html("<table summary='diffstat' class='diffstat'>"); |
164 | max_changes = 0; |
166 | max_changes = 0; |
165 | cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, NULL); |
167 | cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, NULL); |
166 | for(i = 0; i<files; i++) |
168 | for(i = 0; i<files; i++) |
167 | print_fileinfo(&items[i]); |
169 | print_fileinfo(&items[i]); |
168 | html("</table>"); |
170 | html("</table>"); |
169 | html("<div class='diffstat-summary'>"); |
171 | html("<div class='diffstat-summary'>"); |
170 | htmlf("%d files changed, %d insertions, %d deletions", |
172 | htmlf("%d files changed, %d insertions, %d deletions", |
171 | files, total_adds, total_rems); |
173 | files, total_adds, total_rems); |
172 | html("</div>"); |
174 | html("</div>"); |
173 | } |
175 | } |
@@ -237,45 +239,73 @@ static void header(unsigned char *sha1, char *path1, int mode1, |
237 | else |
239 | else |
238 | html_txt(path1); |
240 | html_txt(path1); |
239 | html("<br/>+++ b/"); |
241 | html("<br/>+++ b/"); |
240 | if (mode2 != 0) |
242 | if (mode2 != 0) |
241 | cgit_tree_link(path2, NULL, NULL, ctx.qry.head, |
243 | cgit_tree_link(path2, NULL, NULL, ctx.qry.head, |
242 | sha1_to_hex(new_rev_sha1), path2); |
244 | sha1_to_hex(new_rev_sha1), path2); |
243 | else |
245 | else |
244 | html_txt(path2); |
246 | html_txt(path2); |
245 | } |
247 | } |
246 | html("</div>"); |
248 | html("</div>"); |
247 | } |
249 | } |
248 | |
250 | |
| |
251 | static void print_ssdiff_link() |
| |
252 | { |
| |
253 | if (!strcmp(ctx.qry.page, "diff")) { |
| |
254 | if (use_ssdiff) |
| |
255 | cgit_diff_link("Unidiff", NULL, NULL, ctx.qry.head, |
| |
256 | ctx.qry.sha1, ctx.qry.sha2, ctx.qry.path, 1); |
| |
257 | else |
| |
258 | cgit_diff_link("Side-by-side diff", NULL, NULL, |
| |
259 | ctx.qry.head, ctx.qry.sha1, |
| |
260 | ctx.qry.sha2, ctx.qry.path, 1); |
| |
261 | } |
| |
262 | } |
| |
263 | |
249 | static void filepair_cb(struct diff_filepair *pair) |
264 | static void filepair_cb(struct diff_filepair *pair) |
250 | { |
265 | { |
251 | unsigned long old_size = 0; |
266 | unsigned long old_size = 0; |
252 | unsigned long new_size = 0; |
267 | unsigned long new_size = 0; |
253 | int binary = 0; |
268 | int binary = 0; |
| |
269 | linediff_fn print_line_fn = print_line; |
254 | |
270 | |
| |
271 | if (use_ssdiff) { |
| |
272 | cgit_ssdiff_header_begin(); |
| |
273 | print_line_fn = cgit_ssdiff_line_cb; |
| |
274 | } |
255 | header(pair->one->sha1, pair->one->path, pair->one->mode, |
275 | header(pair->one->sha1, pair->one->path, pair->one->mode, |
256 | pair->two->sha1, pair->two->path, pair->two->mode); |
276 | pair->two->sha1, pair->two->path, pair->two->mode); |
| |
277 | if (use_ssdiff) |
| |
278 | cgit_ssdiff_header_end(); |
257 | if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) { |
279 | if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) { |
258 | if (S_ISGITLINK(pair->one->mode)) |
280 | if (S_ISGITLINK(pair->one->mode)) |
259 | print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52); |
281 | print_line_fn(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52); |
260 | if (S_ISGITLINK(pair->two->mode)) |
282 | if (S_ISGITLINK(pair->two->mode)) |
261 | print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); |
283 | print_line_fn(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); |
| |
284 | if (use_ssdiff) |
| |
285 | cgit_ssdiff_footer(); |
262 | return; |
286 | return; |
263 | } |
287 | } |
264 | if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, |
288 | if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, |
265 | &new_size, &binary, print_line)) |
289 | &new_size, &binary, print_line_fn)) |
266 | cgit_print_error("Error running diff"); |
290 | cgit_print_error("Error running diff"); |
267 | if (binary) |
291 | if (binary) { |
| |
292 | if (use_ssdiff) |
| |
293 | html("<tr><td colspan='4'>Binary files differ</td></tr>"); |
| |
294 | else |
268 | html("Binary files differ"); |
295 | html("Binary files differ"); |
269 | } |
296 | } |
| |
297 | if (use_ssdiff) |
| |
298 | cgit_ssdiff_footer(); |
| |
299 | } |
270 | |
300 | |
271 | void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefix) |
301 | void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefix) |
272 | { |
302 | { |
273 | enum object_type type; |
303 | enum object_type type; |
274 | unsigned long size; |
304 | unsigned long size; |
275 | struct commit *commit, *commit2; |
305 | struct commit *commit, *commit2; |
276 | |
306 | |
277 | if (!new_rev) |
307 | if (!new_rev) |
278 | new_rev = ctx.qry.head; |
308 | new_rev = ctx.qry.head; |
279 | get_sha1(new_rev, new_rev_sha1); |
309 | get_sha1(new_rev, new_rev_sha1); |
280 | type = sha1_object_info(new_rev_sha1, &size); |
310 | type = sha1_object_info(new_rev_sha1, &size); |
281 | if (type == OBJ_BAD) { |
311 | if (type == OBJ_BAD) { |
@@ -294,20 +324,30 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefi |
294 | hashclr(old_rev_sha1); |
324 | hashclr(old_rev_sha1); |
295 | |
325 | |
296 | if (!is_null_sha1(old_rev_sha1)) { |
326 | if (!is_null_sha1(old_rev_sha1)) { |
297 | type = sha1_object_info(old_rev_sha1, &size); |
327 | type = sha1_object_info(old_rev_sha1, &size); |
298 | if (type == OBJ_BAD) { |
328 | if (type == OBJ_BAD) { |
299 | cgit_print_error(fmt("Bad object name: %s", sha1_to_hex(old_rev_sha1))); |
329 | cgit_print_error(fmt("Bad object name: %s", sha1_to_hex(old_rev_sha1))); |
300 | return; |
330 | return; |
301 | } |
331 | } |
302 | commit2 = lookup_commit_reference(old_rev_sha1); |
332 | commit2 = lookup_commit_reference(old_rev_sha1); |
303 | if (!commit2 || parse_commit(commit2)) |
333 | if (!commit2 || parse_commit(commit2)) |
304 | cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(old_rev_sha1))); |
334 | cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(old_rev_sha1))); |
305 | } |
335 | } |
| |
336 | |
| |
337 | if ((ctx.qry.ssdiff && !ctx.cfg.ssdiff) || (!ctx.qry.ssdiff && ctx.cfg.ssdiff)) |
| |
338 | use_ssdiff = 1; |
| |
339 | |
| |
340 | print_ssdiff_link(); |
306 | cgit_print_diffstat(old_rev_sha1, new_rev_sha1); |
341 | cgit_print_diffstat(old_rev_sha1, new_rev_sha1); |
307 | |
342 | |
| |
343 | if (use_ssdiff) { |
| |
344 | html("<table summary='ssdiff' class='ssdiff'>"); |
| |
345 | } else { |
308 | html("<table summary='diff' class='diff'>"); |
346 | html("<table summary='diff' class='diff'>"); |
309 | html("<tr><td>"); |
347 | html("<tr><td>"); |
| |
348 | } |
310 | cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix); |
349 | cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix); |
| |
350 | if (!use_ssdiff) |
311 | html("</td></tr>"); |
351 | html("</td></tr>"); |
312 | html("</table>"); |
352 | html("</table>"); |
313 | } |
353 | } |
|