|
diff --git a/ui-diff.c b/ui-diff.c index 878496d..2196745 100644 --- a/ ui-diff.c+++ b/ ui-diff.c |
|
@@ -6,48 +6,51 @@ |
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 | |
12 | |
13 | unsigned char old_rev_sha1[20]; |
13 | unsigned char old_rev_sha1[20]; |
14 | unsigned char new_rev_sha1[20]; |
14 | unsigned char new_rev_sha1[20]; |
15 | |
15 | |
16 | static int files, slots; |
16 | static int files, slots; |
17 | static int total_adds, total_rems, max_changes; |
17 | static int total_adds, total_rems, max_changes; |
18 | static int lines_added, lines_removed; |
18 | static int lines_added, lines_removed; |
19 | |
19 | |
20 | static struct fileinfo { |
20 | static struct fileinfo { |
21 | char status; |
21 | char status; |
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) { |
38 | case DIFF_STATUS_ADDED: |
41 | case DIFF_STATUS_ADDED: |
39 | class = "add"; |
42 | class = "add"; |
40 | break; |
43 | break; |
41 | case DIFF_STATUS_COPIED: |
44 | case DIFF_STATUS_COPIED: |
42 | class = "cpy"; |
45 | class = "cpy"; |
43 | break; |
46 | break; |
44 | case DIFF_STATUS_DELETED: |
47 | case DIFF_STATUS_DELETED: |
45 | class = "del"; |
48 | class = "del"; |
46 | break; |
49 | break; |
47 | case DIFF_STATUS_MODIFIED: |
50 | case DIFF_STATUS_MODIFIED: |
48 | class = "upd"; |
51 | class = "upd"; |
49 | break; |
52 | break; |
50 | case DIFF_STATUS_RENAMED: |
53 | case DIFF_STATUS_RENAMED: |
51 | class = "mov"; |
54 | class = "mov"; |
52 | break; |
55 | break; |
53 | case DIFF_STATUS_TYPE_CHANGED: |
56 | case DIFF_STATUS_TYPE_CHANGED: |
@@ -65,92 +68,104 @@ static void print_fileinfo(struct fileinfo *info) |
65 | |
68 | |
66 | html("<tr>"); |
69 | html("<tr>"); |
67 | htmlf("<td class='mode'>"); |
70 | htmlf("<td class='mode'>"); |
68 | if (is_null_sha1(info->new_sha1)) { |
71 | if (is_null_sha1(info->new_sha1)) { |
69 | cgit_print_filemode(info->old_mode); |
72 | cgit_print_filemode(info->old_mode); |
70 | } else { |
73 | } else { |
71 | cgit_print_filemode(info->new_mode); |
74 | cgit_print_filemode(info->new_mode); |
72 | } |
75 | } |
73 | |
76 | |
74 | if (info->old_mode != info->new_mode && |
77 | if (info->old_mode != info->new_mode && |
75 | !is_null_sha1(info->old_sha1) && |
78 | !is_null_sha1(info->old_sha1) && |
76 | !is_null_sha1(info->new_sha1)) { |
79 | !is_null_sha1(info->new_sha1)) { |
77 | html("<span class='modechange'>["); |
80 | html("<span class='modechange'>["); |
78 | cgit_print_filemode(info->old_mode); |
81 | cgit_print_filemode(info->old_mode); |
79 | html("]</span>"); |
82 | html("]</span>"); |
80 | } |
83 | } |
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%%;'/>", |
97 | (max_changes - info->removed - info->added) * 100.0 / max_changes); |
105 | (max_changes - info->removed - info->added) * 100.0 / max_changes); |
98 | html("</tr></table></td></tr>\n"); |
106 | html("</tr></table></td></tr>\n"); |
99 | } |
107 | } |
100 | |
108 | |
101 | static void count_diff_lines(char *line, int len) |
109 | static void count_diff_lines(char *line, int len) |
102 | { |
110 | { |
103 | if (line && (len > 0)) { |
111 | if (line && (len > 0)) { |
104 | if (line[0] == '+') |
112 | if (line[0] == '+') |
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) |
141 | { |
156 | { |
142 | int i; |
157 | int i; |
143 | |
158 | |
144 | html("<div class='diffstat-header'>"); |
159 | html("<div class='diffstat-header'>"); |
145 | cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.sha1, |
160 | cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.sha1, |
146 | ctx.qry.sha2, NULL); |
161 | ctx.qry.sha2, NULL); |
147 | html("</div>"); |
162 | html("</div>"); |
148 | html("<table summary='diffstat' class='diffstat'>"); |
163 | html("<table summary='diffstat' class='diffstat'>"); |
149 | max_changes = 0; |
164 | max_changes = 0; |
150 | cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, NULL); |
165 | cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, NULL); |
151 | for(i = 0; i<files; i++) |
166 | for(i = 0; i<files; i++) |
152 | print_fileinfo(&items[i]); |
167 | print_fileinfo(&items[i]); |
153 | html("</table>"); |
168 | html("</table>"); |
154 | html("<div class='diffstat-summary'>"); |
169 | html("<div class='diffstat-summary'>"); |
155 | htmlf("%d files changed, %d insertions, %d deletions", |
170 | htmlf("%d files changed, %d insertions, %d deletions", |
156 | files, total_adds, total_rems); |
171 | files, total_adds, total_rems); |
@@ -212,59 +227,66 @@ static void header(unsigned char *sha1, char *path1, int mode1, |
212 | free(abbrev2); |
227 | free(abbrev2); |
213 | if (mode1 != 0 && mode2 != 0) { |
228 | if (mode1 != 0 && mode2 != 0) { |
214 | htmlf(" %.6o", mode1); |
229 | htmlf(" %.6o", mode1); |
215 | if (mode2 != mode1) |
230 | if (mode2 != mode1) |
216 | htmlf("..%.6o", mode2); |
231 | htmlf("..%.6o", mode2); |
217 | } |
232 | } |
218 | html("<br/>--- a/"); |
233 | html("<br/>--- a/"); |
219 | if (mode1 != 0) |
234 | if (mode1 != 0) |
220 | cgit_tree_link(path1, NULL, NULL, ctx.qry.head, |
235 | cgit_tree_link(path1, NULL, NULL, ctx.qry.head, |
221 | sha1_to_hex(old_rev_sha1), path1); |
236 | sha1_to_hex(old_rev_sha1), path1); |
222 | else |
237 | else |
223 | html_txt(path1); |
238 | html_txt(path1); |
224 | html("<br/>+++ b/"); |
239 | html("<br/>+++ b/"); |
225 | if (mode2 != 0) |
240 | if (mode2 != 0) |
226 | cgit_tree_link(path2, NULL, NULL, ctx.qry.head, |
241 | cgit_tree_link(path2, NULL, NULL, ctx.qry.head, |
227 | sha1_to_hex(new_rev_sha1), path2); |
242 | sha1_to_hex(new_rev_sha1), path2); |
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 | |
255 | if (!new_rev) |
277 | if (!new_rev) |
256 | new_rev = ctx.qry.head; |
278 | new_rev = ctx.qry.head; |
257 | get_sha1(new_rev, new_rev_sha1); |
279 | get_sha1(new_rev, new_rev_sha1); |
258 | type = sha1_object_info(new_rev_sha1, &size); |
280 | type = sha1_object_info(new_rev_sha1, &size); |
259 | if (type == OBJ_BAD) { |
281 | if (type == OBJ_BAD) { |
260 | cgit_print_error(fmt("Bad object name: %s", new_rev)); |
282 | cgit_print_error(fmt("Bad object name: %s", new_rev)); |
261 | return; |
283 | return; |
262 | } |
284 | } |
263 | commit = lookup_commit_reference(new_rev_sha1); |
285 | commit = lookup_commit_reference(new_rev_sha1); |
264 | if (!commit || parse_commit(commit)) |
286 | if (!commit || parse_commit(commit)) |
265 | cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(new_rev_sha1))); |
287 | cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(new_rev_sha1))); |
266 | |
288 | |
267 | if (old_rev) |
289 | if (old_rev) |
268 | get_sha1(old_rev, old_rev_sha1); |
290 | get_sha1(old_rev, old_rev_sha1); |
269 | else if (commit->parents && commit->parents->item) |
291 | else if (commit->parents && commit->parents->item) |
270 | hashcpy(old_rev_sha1, commit->parents->item->object.sha1); |
292 | hashcpy(old_rev_sha1, commit->parents->item->object.sha1); |
|