|
diff --git a/ui-diff.c b/ui-diff.c index 2196745..a92a768 100644 --- a/ ui-diff.c+++ b/ ui-diff.c |
|
@@ -1,313 +1,353 @@ |
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; |
47 | case DIFF_STATUS_DELETED: |
49 | case DIFF_STATUS_DELETED: |
48 | class = "del"; |
50 | class = "del"; |
49 | break; |
51 | break; |
50 | case DIFF_STATUS_MODIFIED: |
52 | case DIFF_STATUS_MODIFIED: |
51 | class = "upd"; |
53 | class = "upd"; |
52 | break; |
54 | break; |
53 | case DIFF_STATUS_RENAMED: |
55 | case DIFF_STATUS_RENAMED: |
54 | class = "mov"; |
56 | class = "mov"; |
55 | break; |
57 | break; |
56 | case DIFF_STATUS_TYPE_CHANGED: |
58 | case DIFF_STATUS_TYPE_CHANGED: |
57 | class = "typ"; |
59 | class = "typ"; |
58 | break; |
60 | break; |
59 | case DIFF_STATUS_UNKNOWN: |
61 | case DIFF_STATUS_UNKNOWN: |
60 | class = "unk"; |
62 | class = "unk"; |
61 | break; |
63 | break; |
62 | case DIFF_STATUS_UNMERGED: |
64 | case DIFF_STATUS_UNMERGED: |
63 | class = "stg"; |
65 | class = "stg"; |
64 | break; |
66 | break; |
65 | default: |
67 | default: |
66 | die("bug: unhandled diff status %c", info->status); |
68 | die("bug: unhandled diff status %c", info->status); |
67 | } |
69 | } |
68 | |
70 | |
69 | html("<tr>"); |
71 | html("<tr>"); |
70 | htmlf("<td class='mode'>"); |
72 | htmlf("<td class='mode'>"); |
71 | if (is_null_sha1(info->new_sha1)) { |
73 | if (is_null_sha1(info->new_sha1)) { |
72 | cgit_print_filemode(info->old_mode); |
74 | cgit_print_filemode(info->old_mode); |
73 | } else { |
75 | } else { |
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'>"); |
99 | htmlf("<table summary='file diffstat' width='%d%%'><tr>", (max_changes > 100 ? 100 : max_changes)); |
101 | htmlf("<table summary='file diffstat' width='%d%%'><tr>", (max_changes > 100 ? 100 : max_changes)); |
100 | htmlf("<td class='add' style='width: %.1f%%;'/>", |
102 | htmlf("<td class='add' style='width: %.1f%%;'/>", |
101 | info->added * 100.0 / max_changes); |
103 | info->added * 100.0 / max_changes); |
102 | htmlf("<td class='rem' style='width: %.1f%%;'/>", |
104 | htmlf("<td class='rem' style='width: %.1f%%;'/>", |
103 | info->removed * 100.0 / max_changes); |
105 | info->removed * 100.0 / max_changes); |
104 | htmlf("<td class='none' style='width: %.1f%%;'/>", |
106 | htmlf("<td class='none' style='width: %.1f%%;'/>", |
105 | (max_changes - info->removed - info->added) * 100.0 / max_changes); |
107 | (max_changes - info->removed - info->added) * 100.0 / max_changes); |
106 | html("</tr></table></td></tr>\n"); |
108 | html("</tr></table></td></tr>\n"); |
107 | } |
109 | } |
108 | |
110 | |
109 | static void count_diff_lines(char *line, int len) |
111 | static void count_diff_lines(char *line, int len) |
110 | { |
112 | { |
111 | if (line && (len > 0)) { |
113 | if (line && (len > 0)) { |
112 | if (line[0] == '+') |
114 | if (line[0] == '+') |
113 | lines_added++; |
115 | lines_added++; |
114 | else if (line[0] == '-') |
116 | else if (line[0] == '-') |
115 | lines_removed++; |
117 | lines_removed++; |
116 | } |
118 | } |
117 | } |
119 | } |
118 | |
120 | |
119 | static void inspect_filepair(struct diff_filepair *pair) |
121 | static void inspect_filepair(struct diff_filepair *pair) |
120 | { |
122 | { |
121 | int binary = 0; |
123 | int binary = 0; |
122 | unsigned long old_size = 0; |
124 | unsigned long old_size = 0; |
123 | unsigned long new_size = 0; |
125 | unsigned long new_size = 0; |
124 | files++; |
126 | files++; |
125 | lines_added = 0; |
127 | lines_added = 0; |
126 | lines_removed = 0; |
128 | lines_removed = 0; |
127 | cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, &new_size, |
129 | cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, &new_size, |
128 | &binary, count_diff_lines); |
130 | &binary, count_diff_lines); |
129 | if (files >= slots) { |
131 | if (files >= slots) { |
130 | if (slots == 0) |
132 | if (slots == 0) |
131 | slots = 4; |
133 | slots = 4; |
132 | else |
134 | else |
133 | slots = slots * 2; |
135 | slots = slots * 2; |
134 | items = xrealloc(items, slots * sizeof(struct fileinfo)); |
136 | items = xrealloc(items, slots * sizeof(struct fileinfo)); |
135 | } |
137 | } |
136 | items[files-1].status = pair->status; |
138 | items[files-1].status = pair->status; |
137 | hashcpy(items[files-1].old_sha1, pair->one->sha1); |
139 | hashcpy(items[files-1].old_sha1, pair->one->sha1); |
138 | hashcpy(items[files-1].new_sha1, pair->two->sha1); |
140 | hashcpy(items[files-1].new_sha1, pair->two->sha1); |
139 | items[files-1].old_mode = pair->one->mode; |
141 | items[files-1].old_mode = pair->one->mode; |
140 | items[files-1].new_mode = pair->two->mode; |
142 | items[files-1].new_mode = pair->two->mode; |
141 | items[files-1].old_path = xstrdup(pair->one->path); |
143 | items[files-1].old_path = xstrdup(pair->one->path); |
142 | items[files-1].new_path = xstrdup(pair->two->path); |
144 | items[files-1].new_path = xstrdup(pair->two->path); |
143 | items[files-1].added = lines_added; |
145 | items[files-1].added = lines_added; |
144 | items[files-1].removed = lines_removed; |
146 | items[files-1].removed = lines_removed; |
145 | items[files-1].old_size = old_size; |
147 | items[files-1].old_size = old_size; |
146 | items[files-1].new_size = new_size; |
148 | items[files-1].new_size = new_size; |
147 | items[files-1].binary = binary; |
149 | items[files-1].binary = binary; |
148 | if (lines_added + lines_removed > max_changes) |
150 | if (lines_added + lines_removed > max_changes) |
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 | } |
174 | |
176 | |
175 | |
177 | |
176 | /* |
178 | /* |
177 | * print a single line returned from xdiff |
179 | * print a single line returned from xdiff |
178 | */ |
180 | */ |
179 | static void print_line(char *line, int len) |
181 | static void print_line(char *line, int len) |
180 | { |
182 | { |
181 | char *class = "ctx"; |
183 | char *class = "ctx"; |
182 | char c = line[len-1]; |
184 | char c = line[len-1]; |
183 | |
185 | |
184 | if (line[0] == '+') |
186 | if (line[0] == '+') |
185 | class = "add"; |
187 | class = "add"; |
186 | else if (line[0] == '-') |
188 | else if (line[0] == '-') |
187 | class = "del"; |
189 | class = "del"; |
188 | else if (line[0] == '@') |
190 | else if (line[0] == '@') |
189 | class = "hunk"; |
191 | class = "hunk"; |
190 | |
192 | |
191 | htmlf("<div class='%s'>", class); |
193 | htmlf("<div class='%s'>", class); |
192 | line[len-1] = '\0'; |
194 | line[len-1] = '\0'; |
193 | html_txt(line); |
195 | html_txt(line); |
194 | html("</div>"); |
196 | html("</div>"); |
195 | line[len-1] = c; |
197 | line[len-1] = c; |
196 | } |
198 | } |
197 | |
199 | |
198 | static void header(unsigned char *sha1, char *path1, int mode1, |
200 | static void header(unsigned char *sha1, char *path1, int mode1, |
199 | unsigned char *sha2, char *path2, int mode2) |
201 | unsigned char *sha2, char *path2, int mode2) |
200 | { |
202 | { |
201 | char *abbrev1, *abbrev2; |
203 | char *abbrev1, *abbrev2; |
202 | int subproject; |
204 | int subproject; |
203 | |
205 | |
204 | subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2)); |
206 | subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2)); |
205 | html("<div class='head'>"); |
207 | html("<div class='head'>"); |
206 | html("diff --git a/"); |
208 | html("diff --git a/"); |
207 | html_txt(path1); |
209 | html_txt(path1); |
208 | html(" b/"); |
210 | html(" b/"); |
209 | html_txt(path2); |
211 | html_txt(path2); |
210 | |
212 | |
211 | if (is_null_sha1(sha1)) |
213 | if (is_null_sha1(sha1)) |
212 | path1 = "dev/null"; |
214 | path1 = "dev/null"; |
213 | if (is_null_sha1(sha2)) |
215 | if (is_null_sha1(sha2)) |
214 | path2 = "dev/null"; |
216 | path2 = "dev/null"; |
215 | |
217 | |
216 | if (mode1 == 0) |
218 | if (mode1 == 0) |
217 | htmlf("<br/>new file mode %.6o", mode2); |
219 | htmlf("<br/>new file mode %.6o", mode2); |
218 | |
220 | |
219 | if (mode2 == 0) |
221 | if (mode2 == 0) |
220 | htmlf("<br/>deleted file mode %.6o", mode1); |
222 | htmlf("<br/>deleted file mode %.6o", mode1); |
221 | |
223 | |
222 | if (!subproject) { |
224 | if (!subproject) { |
223 | abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV)); |
225 | abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV)); |
224 | abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV)); |
226 | abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV)); |
225 | htmlf("<br/>index %s..%s", abbrev1, abbrev2); |
227 | htmlf("<br/>index %s..%s", abbrev1, abbrev2); |
226 | free(abbrev1); |
228 | free(abbrev1); |
227 | free(abbrev2); |
229 | free(abbrev2); |
228 | if (mode1 != 0 && mode2 != 0) { |
230 | if (mode1 != 0 && mode2 != 0) { |
229 | htmlf(" %.6o", mode1); |
231 | htmlf(" %.6o", mode1); |
230 | if (mode2 != mode1) |
232 | if (mode2 != mode1) |
231 | htmlf("..%.6o", mode2); |
233 | htmlf("..%.6o", mode2); |
232 | } |
234 | } |
233 | html("<br/>--- a/"); |
235 | html("<br/>--- a/"); |
234 | if (mode1 != 0) |
236 | if (mode1 != 0) |
235 | cgit_tree_link(path1, NULL, NULL, ctx.qry.head, |
237 | cgit_tree_link(path1, NULL, NULL, ctx.qry.head, |
236 | sha1_to_hex(old_rev_sha1), path1); |
238 | sha1_to_hex(old_rev_sha1), path1); |
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) { |
282 | cgit_print_error(fmt("Bad object name: %s", new_rev)); |
312 | cgit_print_error(fmt("Bad object name: %s", new_rev)); |
283 | return; |
313 | return; |
284 | } |
314 | } |
285 | commit = lookup_commit_reference(new_rev_sha1); |
315 | commit = lookup_commit_reference(new_rev_sha1); |
286 | if (!commit || parse_commit(commit)) |
316 | if (!commit || parse_commit(commit)) |
287 | cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(new_rev_sha1))); |
317 | cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(new_rev_sha1))); |
288 | |
318 | |
289 | if (old_rev) |
319 | if (old_rev) |
290 | get_sha1(old_rev, old_rev_sha1); |
320 | get_sha1(old_rev, old_rev_sha1); |
291 | else if (commit->parents && commit->parents->item) |
321 | else if (commit->parents && commit->parents->item) |
292 | hashcpy(old_rev_sha1, commit->parents->item->object.sha1); |
322 | hashcpy(old_rev_sha1, commit->parents->item->object.sha1); |
293 | else |
323 | else |
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 | } |
|