ui-diff.c (view raw)
1/* ui-diff.c: show diff between two blobs
2 *
3 * Copyright (C) 2006 Lars Hjemli
4 *
5 * Licensed under GNU General Public License v2
6 * (see COPYING for full license text)
7 */
8
9#include "cgit.h"
10#include "html.h"
11#include "ui-shared.h"
12#include "ui-ssdiff.h"
13
14unsigned char old_rev_sha1[20];
15unsigned char new_rev_sha1[20];
16
17static int files, slots;
18static int total_adds, total_rems, max_changes;
19static int lines_added, lines_removed;
20
21static struct fileinfo {
22 char status;
23 unsigned char old_sha1[20];
24 unsigned char new_sha1[20];
25 unsigned short old_mode;
26 unsigned short new_mode;
27 char *old_path;
28 char *new_path;
29 unsigned int added;
30 unsigned int removed;
31 unsigned long old_size;
32 unsigned long new_size;
33 int binary:1;
34} *items;
35
36static int use_ssdiff = 0;
37static struct diff_filepair *current_filepair;
38
39struct diff_filespec *cgit_get_current_old_file(void)
40{
41 return current_filepair->one;
42}
43
44struct diff_filespec *cgit_get_current_new_file(void)
45{
46 return current_filepair->two;
47}
48
49static void print_fileinfo(struct fileinfo *info)
50{
51 char *class;
52
53 switch (info->status) {
54 case DIFF_STATUS_ADDED:
55 class = "add";
56 break;
57 case DIFF_STATUS_COPIED:
58 class = "cpy";
59 break;
60 case DIFF_STATUS_DELETED:
61 class = "del";
62 break;
63 case DIFF_STATUS_MODIFIED:
64 class = "upd";
65 break;
66 case DIFF_STATUS_RENAMED:
67 class = "mov";
68 break;
69 case DIFF_STATUS_TYPE_CHANGED:
70 class = "typ";
71 break;
72 case DIFF_STATUS_UNKNOWN:
73 class = "unk";
74 break;
75 case DIFF_STATUS_UNMERGED:
76 class = "stg";
77 break;
78 default:
79 die("bug: unhandled diff status %c", info->status);
80 }
81
82 html("<tr>");
83 htmlf("<td class='mode'>");
84 if (is_null_sha1(info->new_sha1)) {
85 cgit_print_filemode(info->old_mode);
86 } else {
87 cgit_print_filemode(info->new_mode);
88 }
89
90 if (info->old_mode != info->new_mode &&
91 !is_null_sha1(info->old_sha1) &&
92 !is_null_sha1(info->new_sha1)) {
93 html("<span class='modechange'>[");
94 cgit_print_filemode(info->old_mode);
95 html("]</span>");
96 }
97 htmlf("</td><td class='%s'>", class);
98 cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.sha1,
99 ctx.qry.sha2, info->new_path, 0);
100 if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED) {
101 htmlf(" (%s from ",
102 info->status == DIFF_STATUS_COPIED ? "copied" : "renamed");
103 html_txt(info->old_path);
104 html(")");
105 }
106 html("</td><td class='right'>");
107 if (info->binary) {
108 htmlf("bin</td><td class='graph'>%ld -> %ld bytes",
109 info->old_size, info->new_size);
110 return;
111 }
112 htmlf("%d", info->added + info->removed);
113 html("</td><td class='graph'>");
114 htmlf("<table summary='file diffstat' width='%d%%'><tr>", (max_changes > 100 ? 100 : max_changes));
115 htmlf("<td class='add' style='width: %.1f%%;'/>",
116 info->added * 100.0 / max_changes);
117 htmlf("<td class='rem' style='width: %.1f%%;'/>",
118 info->removed * 100.0 / max_changes);
119 htmlf("<td class='none' style='width: %.1f%%;'/>",
120 (max_changes - info->removed - info->added) * 100.0 / max_changes);
121 html("</tr></table></td></tr>\n");
122}
123
124static void count_diff_lines(char *line, int len)
125{
126 if (line && (len > 0)) {
127 if (line[0] == '+')
128 lines_added++;
129 else if (line[0] == '-')
130 lines_removed++;
131 }
132}
133
134static void inspect_filepair(struct diff_filepair *pair)
135{
136 int binary = 0;
137 unsigned long old_size = 0;
138 unsigned long new_size = 0;
139 files++;
140 lines_added = 0;
141 lines_removed = 0;
142 cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, &new_size,
143 &binary, 0, ctx.qry.ignorews, count_diff_lines);
144 if (files >= slots) {
145 if (slots == 0)
146 slots = 4;
147 else
148 slots = slots * 2;
149 items = xrealloc(items, slots * sizeof(struct fileinfo));
150 }
151 items[files-1].status = pair->status;
152 hashcpy(items[files-1].old_sha1, pair->one->sha1);
153 hashcpy(items[files-1].new_sha1, pair->two->sha1);
154 items[files-1].old_mode = pair->one->mode;
155 items[files-1].new_mode = pair->two->mode;
156 items[files-1].old_path = xstrdup(pair->one->path);
157 items[files-1].new_path = xstrdup(pair->two->path);
158 items[files-1].added = lines_added;
159 items[files-1].removed = lines_removed;
160 items[files-1].old_size = old_size;
161 items[files-1].new_size = new_size;
162 items[files-1].binary = binary;
163 if (lines_added + lines_removed > max_changes)
164 max_changes = lines_added + lines_removed;
165 total_adds += lines_added;
166 total_rems += lines_removed;
167}
168
169static void cgit_print_diffstat(const unsigned char *old_sha1,
170 const unsigned char *new_sha1,
171 const char *prefix)
172{
173 int i;
174
175 html("<div class='diffstat-header'>");
176 cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.sha1,
177 ctx.qry.sha2, NULL, 0);
178 if (prefix) {
179 html(" (limited to '");
180 html_txt(prefix);
181 html("')");
182 }
183 html("</div>");
184 html("<table summary='diffstat' class='diffstat'>");
185 max_changes = 0;
186 cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, prefix,
187 ctx.qry.ignorews);
188 for (i = 0; i<files; i++)
189 print_fileinfo(&items[i]);
190 html("</table>");
191 html("<div class='diffstat-summary'>");
192 htmlf("%d files changed, %d insertions, %d deletions",
193 files, total_adds, total_rems);
194 html("</div>");
195}
196
197
198/*
199 * print a single line returned from xdiff
200 */
201static void print_line(char *line, int len)
202{
203 char *class = "ctx";
204 char c = line[len-1];
205
206 if (line[0] == '+')
207 class = "add";
208 else if (line[0] == '-')
209 class = "del";
210 else if (line[0] == '@')
211 class = "hunk";
212
213 htmlf("<div class='%s'>", class);
214 line[len-1] = '\0';
215 html_txt(line);
216 html("</div>");
217 line[len-1] = c;
218}
219
220static void header(unsigned char *sha1, char *path1, int mode1,
221 unsigned char *sha2, char *path2, int mode2)
222{
223 char *abbrev1, *abbrev2;
224 int subproject;
225
226 subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2));
227 html("<div class='head'>");
228 html("diff --git a/");
229 html_txt(path1);
230 html(" b/");
231 html_txt(path2);
232
233 if (mode1 == 0)
234 htmlf("<br/>new file mode %.6o", mode2);
235
236 if (mode2 == 0)
237 htmlf("<br/>deleted file mode %.6o", mode1);
238
239 if (!subproject) {
240 abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV));
241 abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV));
242 htmlf("<br/>index %s..%s", abbrev1, abbrev2);
243 free(abbrev1);
244 free(abbrev2);
245 if (mode1 != 0 && mode2 != 0) {
246 htmlf(" %.6o", mode1);
247 if (mode2 != mode1)
248 htmlf("..%.6o", mode2);
249 }
250 if (is_null_sha1(sha1)) {
251 path1 = "dev/null";
252 html("<br/>--- /");
253 } else
254 html("<br/>--- a/");
255 if (mode1 != 0)
256 cgit_tree_link(path1, NULL, NULL, ctx.qry.head,
257 sha1_to_hex(old_rev_sha1), path1);
258 else
259 html_txt(path1);
260 if (is_null_sha1(sha2)) {
261 path2 = "dev/null";
262 html("<br/>+++ /");
263 } else
264 html("<br/>+++ b/");
265 if (mode2 != 0)
266 cgit_tree_link(path2, NULL, NULL, ctx.qry.head,
267 sha1_to_hex(new_rev_sha1), path2);
268 else
269 html_txt(path2);
270 }
271 html("</div>");
272}
273
274static void filepair_cb(struct diff_filepair *pair)
275{
276 unsigned long old_size = 0;
277 unsigned long new_size = 0;
278 int binary = 0;
279 linediff_fn print_line_fn = print_line;
280
281 current_filepair = pair;
282 if (use_ssdiff) {
283 cgit_ssdiff_header_begin();
284 print_line_fn = cgit_ssdiff_line_cb;
285 }
286 header(pair->one->sha1, pair->one->path, pair->one->mode,
287 pair->two->sha1, pair->two->path, pair->two->mode);
288 if (use_ssdiff)
289 cgit_ssdiff_header_end();
290 if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) {
291 if (S_ISGITLINK(pair->one->mode))
292 print_line_fn(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52);
293 if (S_ISGITLINK(pair->two->mode))
294 print_line_fn(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52);
295 if (use_ssdiff)
296 cgit_ssdiff_footer();
297 return;
298 }
299 if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,
300 &new_size, &binary, ctx.qry.context,
301 ctx.qry.ignorews, print_line_fn))
302 cgit_print_error("Error running diff");
303 if (binary) {
304 if (use_ssdiff)
305 html("<tr><td colspan='4'>Binary files differ</td></tr>");
306 else
307 html("Binary files differ");
308 }
309 if (use_ssdiff)
310 cgit_ssdiff_footer();
311}
312
313void cgit_print_diff_ctrls()
314{
315 int i, curr;
316
317 html("<div class='cgit-panel'>");
318 html("<b>diff options</b>");
319 html("<form method='get' action='.'>");
320 cgit_add_hidden_formfields(1, 0, ctx.qry.page);
321 html("<table>");
322 html("<tr><td colspan='2'/></tr>");
323 html("<tr>");
324 html("<td class='label'>context:</td>");
325 html("<td class='ctrl'>");
326 html("<select name='context' onchange='this.form.submit();'>");
327 curr = ctx.qry.context;
328 if (!curr)
329 curr = 3;
330 for (i = 1; i <= 10; i++)
331 html_intoption(i, fmt("%d", i), curr);
332 for (i = 15; i <= 40; i += 5)
333 html_intoption(i, fmt("%d", i), curr);
334 html("</select>");
335 html("</td>");
336 html("</tr><tr>");
337 html("<td class='label'>space:</td>");
338 html("<td class='ctrl'>");
339 html("<select name='ignorews' onchange='this.form.submit();'>");
340 html_intoption(0, "include", ctx.qry.ignorews);
341 html_intoption(1, "ignore", ctx.qry.ignorews);
342 html("</select>");
343 html("</td>");
344 html("</tr><tr>");
345 html("<td class='label'>mode:</td>");
346 html("<td class='ctrl'>");
347 html("<select name='ss' onchange='this.form.submit();'>");
348 curr = ctx.qry.has_ssdiff ? ctx.qry.ssdiff : ctx.cfg.ssdiff;
349 html_intoption(0, "unified", curr);
350 html_intoption(1, "ssdiff", curr);
351 html("</select></td></tr>");
352 html("<tr><td/><td class='ctrl'>");
353 html("<noscript><input type='submit' value='reload'/></noscript>");
354 html("</td></tr></table>");
355 html("</form>");
356 html("</div>");
357}
358
359void cgit_print_diff(const char *new_rev, const char *old_rev,
360 const char *prefix, int show_ctrls)
361{
362 enum object_type type;
363 unsigned long size;
364 struct commit *commit, *commit2;
365
366 if (!new_rev)
367 new_rev = ctx.qry.head;
368 get_sha1(new_rev, new_rev_sha1);
369 type = sha1_object_info(new_rev_sha1, &size);
370 if (type == OBJ_BAD) {
371 cgit_print_error(fmt("Bad object name: %s", new_rev));
372 return;
373 }
374 commit = lookup_commit_reference(new_rev_sha1);
375 if (!commit || parse_commit(commit)) {
376 cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(new_rev_sha1)));
377 return;
378 }
379
380 if (old_rev)
381 get_sha1(old_rev, old_rev_sha1);
382 else if (commit->parents && commit->parents->item)
383 hashcpy(old_rev_sha1, commit->parents->item->object.sha1);
384 else
385 hashclr(old_rev_sha1);
386
387 if (!is_null_sha1(old_rev_sha1)) {
388 type = sha1_object_info(old_rev_sha1, &size);
389 if (type == OBJ_BAD) {
390 cgit_print_error(fmt("Bad object name: %s", sha1_to_hex(old_rev_sha1)));
391 return;
392 }
393 commit2 = lookup_commit_reference(old_rev_sha1);
394 if (!commit2 || parse_commit(commit2)) {
395 cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(old_rev_sha1)));
396 return;
397 }
398 }
399
400 use_ssdiff = ctx.qry.has_ssdiff ? ctx.qry.ssdiff : ctx.cfg.ssdiff;
401
402 if (show_ctrls)
403 cgit_print_diff_ctrls();
404
405 cgit_print_diffstat(old_rev_sha1, new_rev_sha1, prefix);
406
407 if (use_ssdiff) {
408 html("<table summary='ssdiff' class='ssdiff'>");
409 } else {
410 html("<table summary='diff' class='diff'>");
411 html("<tr><td>");
412 }
413 cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix,
414 ctx.qry.ignorews);
415 if (!use_ssdiff)
416 html("</td></tr>");
417 html("</table>");
418}