blob: 1209c47c6c0b45f599dd98813dfab3282992a0a7 [file] [log] [blame]
Lars Hjemli36aba002006-12-20 22:48:27 +01001/* 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"
John Keeping8f208792013-04-06 11:37:59 +010010#include "ui-diff.h"
Lars Hjemlib1f9b9c2008-02-23 22:45:33 +010011#include "html.h"
Lars Hjemlia4d1ca12008-03-24 16:50:57 +010012#include "ui-shared.h"
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +020013#include "ui-ssdiff.h"
Lars Hjemli36aba002006-12-20 22:48:27 +010014
Lars Hjemlie238ebe2007-10-01 12:30:29 +020015unsigned char old_rev_sha1[20];
16unsigned char new_rev_sha1[20];
17
Lars Hjemlife1230d2008-04-24 23:32:02 +020018static int files, slots;
19static int total_adds, total_rems, max_changes;
20static int lines_added, lines_removed;
Lars Hjemlife1230d2008-04-24 23:32:02 +020021
22static struct fileinfo {
23 char status;
24 unsigned char old_sha1[20];
25 unsigned char new_sha1[20];
26 unsigned short old_mode;
27 unsigned short new_mode;
28 char *old_path;
29 char *new_path;
30 unsigned int added;
31 unsigned int removed;
Lars Hjemlic495cf02009-01-31 10:40:40 +010032 unsigned long old_size;
33 unsigned long new_size;
34 int binary:1;
Lars Hjemlife1230d2008-04-24 23:32:02 +020035} *items;
36
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +020037static int use_ssdiff = 0;
Bernhard Reutner-Fischere52040b2010-12-23 12:47:55 +010038static struct diff_filepair *current_filepair;
39
40struct diff_filespec *cgit_get_current_old_file(void)
41{
42 return current_filepair->one;
43}
44
45struct diff_filespec *cgit_get_current_new_file(void)
46{
47 return current_filepair->two;
48}
Lars Hjemlife1230d2008-04-24 23:32:02 +020049
50static void print_fileinfo(struct fileinfo *info)
51{
52 char *class;
53
54 switch (info->status) {
55 case DIFF_STATUS_ADDED:
56 class = "add";
57 break;
58 case DIFF_STATUS_COPIED:
59 class = "cpy";
60 break;
61 case DIFF_STATUS_DELETED:
62 class = "del";
63 break;
64 case DIFF_STATUS_MODIFIED:
65 class = "upd";
66 break;
67 case DIFF_STATUS_RENAMED:
68 class = "mov";
69 break;
70 case DIFF_STATUS_TYPE_CHANGED:
71 class = "typ";
72 break;
73 case DIFF_STATUS_UNKNOWN:
74 class = "unk";
75 break;
76 case DIFF_STATUS_UNMERGED:
77 class = "stg";
78 break;
79 default:
80 die("bug: unhandled diff status %c", info->status);
81 }
82
83 html("<tr>");
84 htmlf("<td class='mode'>");
85 if (is_null_sha1(info->new_sha1)) {
86 cgit_print_filemode(info->old_mode);
87 } else {
88 cgit_print_filemode(info->new_mode);
89 }
90
91 if (info->old_mode != info->new_mode &&
92 !is_null_sha1(info->old_sha1) &&
93 !is_null_sha1(info->new_sha1)) {
94 html("<span class='modechange'>[");
95 cgit_print_filemode(info->old_mode);
96 html("]</span>");
97 }
98 htmlf("</td><td class='%s'>", class);
Lars Hjemli04619c92008-09-23 17:47:26 +020099 cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.sha1,
Ragnar Ouchterlonyc358aa32009-09-14 20:19:02 +0200100 ctx.qry.sha2, info->new_path, 0);
Lukas Fleischerbebe89d2011-07-22 13:47:19 +0200101 if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED) {
102 htmlf(" (%s from ",
103 info->status == DIFF_STATUS_COPIED ? "copied" : "renamed");
104 html_txt(info->old_path);
105 html(")");
106 }
Lars Hjemlife1230d2008-04-24 23:32:02 +0200107 html("</td><td class='right'>");
Lars Hjemlic495cf02009-01-31 10:40:40 +0100108 if (info->binary) {
Mark Lodatoe4ddc8f2010-09-04 11:30:18 -0400109 htmlf("bin</td><td class='graph'>%ld -> %ld bytes",
Lars Hjemlic495cf02009-01-31 10:40:40 +0100110 info->old_size, info->new_size);
111 return;
112 }
Lars Hjemlife1230d2008-04-24 23:32:02 +0200113 htmlf("%d", info->added + info->removed);
114 html("</td><td class='graph'>");
115 htmlf("<table summary='file diffstat' width='%d%%'><tr>", (max_changes > 100 ? 100 : max_changes));
116 htmlf("<td class='add' style='width: %.1f%%;'/>",
117 info->added * 100.0 / max_changes);
118 htmlf("<td class='rem' style='width: %.1f%%;'/>",
119 info->removed * 100.0 / max_changes);
120 htmlf("<td class='none' style='width: %.1f%%;'/>",
121 (max_changes - info->removed - info->added) * 100.0 / max_changes);
122 html("</tr></table></td></tr>\n");
123}
124
125static void count_diff_lines(char *line, int len)
126{
127 if (line && (len > 0)) {
128 if (line[0] == '+')
129 lines_added++;
130 else if (line[0] == '-')
131 lines_removed++;
132 }
133}
134
135static void inspect_filepair(struct diff_filepair *pair)
136{
Lars Hjemlic495cf02009-01-31 10:40:40 +0100137 int binary = 0;
138 unsigned long old_size = 0;
139 unsigned long new_size = 0;
Lars Hjemlife1230d2008-04-24 23:32:02 +0200140 files++;
141 lines_added = 0;
142 lines_removed = 0;
Lars Hjemlic495cf02009-01-31 10:40:40 +0100143 cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, &new_size,
Johan Herland2cc8b992010-06-24 17:52:57 +0200144 &binary, 0, ctx.qry.ignorews, count_diff_lines);
Lars Hjemlife1230d2008-04-24 23:32:02 +0200145 if (files >= slots) {
146 if (slots == 0)
147 slots = 4;
148 else
149 slots = slots * 2;
150 items = xrealloc(items, slots * sizeof(struct fileinfo));
151 }
152 items[files-1].status = pair->status;
153 hashcpy(items[files-1].old_sha1, pair->one->sha1);
154 hashcpy(items[files-1].new_sha1, pair->two->sha1);
155 items[files-1].old_mode = pair->one->mode;
156 items[files-1].new_mode = pair->two->mode;
157 items[files-1].old_path = xstrdup(pair->one->path);
158 items[files-1].new_path = xstrdup(pair->two->path);
159 items[files-1].added = lines_added;
160 items[files-1].removed = lines_removed;
Lars Hjemlic495cf02009-01-31 10:40:40 +0100161 items[files-1].old_size = old_size;
162 items[files-1].new_size = new_size;
163 items[files-1].binary = binary;
Lars Hjemlife1230d2008-04-24 23:32:02 +0200164 if (lines_added + lines_removed > max_changes)
165 max_changes = lines_added + lines_removed;
166 total_adds += lines_added;
167 total_rems += lines_removed;
168}
169
Lukas Fleischerbafab422013-03-04 08:52:33 +0100170static void cgit_print_diffstat(const unsigned char *old_sha1,
171 const unsigned char *new_sha1,
172 const char *prefix)
Lars Hjemlife1230d2008-04-24 23:32:02 +0200173{
Lars Hjemli962a2482011-03-06 23:59:56 +0100174 int i;
Lars Hjemlife1230d2008-04-24 23:32:02 +0200175
Lars Hjemlif82b1942008-09-23 17:54:45 +0200176 html("<div class='diffstat-header'>");
177 cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.sha1,
Ragnar Ouchterlonyc358aa32009-09-14 20:19:02 +0200178 ctx.qry.sha2, NULL, 0);
Lukasz Janyst7f3c6e02011-03-05 14:10:55 +0100179 if (prefix) {
180 html(" (limited to '");
181 html_txt(prefix);
182 html("')");
183 }
Lars Hjemlif82b1942008-09-23 17:54:45 +0200184 html("</div>");
Lars Hjemlife1230d2008-04-24 23:32:02 +0200185 html("<table summary='diffstat' class='diffstat'>");
186 max_changes = 0;
Johan Herland2cc8b992010-06-24 17:52:57 +0200187 cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, prefix,
188 ctx.qry.ignorews);
Jason A. Donenfeldbdae1d82013-03-03 23:21:33 -0500189 for (i = 0; i<files; i++)
Lars Hjemlife1230d2008-04-24 23:32:02 +0200190 print_fileinfo(&items[i]);
191 html("</table>");
192 html("<div class='diffstat-summary'>");
193 htmlf("%d files changed, %d insertions, %d deletions",
194 files, total_adds, total_rems);
195 html("</div>");
196}
197
198
Lars Hjemli36aba002006-12-20 22:48:27 +0100199/*
200 * print a single line returned from xdiff
201 */
202static void print_line(char *line, int len)
203{
204 char *class = "ctx";
205 char c = line[len-1];
206
207 if (line[0] == '+')
208 class = "add";
209 else if (line[0] == '-')
210 class = "del";
211 else if (line[0] == '@')
212 class = "hunk";
213
214 htmlf("<div class='%s'>", class);
215 line[len-1] = '\0';
216 html_txt(line);
217 html("</div>");
218 line[len-1] = c;
219}
220
Lars Hjemlif4f13392007-05-16 04:21:06 +0200221static void header(unsigned char *sha1, char *path1, int mode1,
222 unsigned char *sha2, char *path2, int mode2)
Lars Hjemlia342ac62007-05-14 18:31:05 +0200223{
224 char *abbrev1, *abbrev2;
Lars Hjemlif4f13392007-05-16 04:21:06 +0200225 int subproject;
226
Jeffrey C. Olliee651cb02007-06-04 12:28:56 -0500227 subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2));
Lars Hjemlia342ac62007-05-14 18:31:05 +0200228 html("<div class='head'>");
229 html("diff --git a/");
230 html_txt(path1);
231 html(" b/");
232 html_txt(path2);
Lars Hjemlif4f13392007-05-16 04:21:06 +0200233
Lars Hjemlif4f13392007-05-16 04:21:06 +0200234 if (mode1 == 0)
235 htmlf("<br/>new file mode %.6o", mode2);
236
237 if (mode2 == 0)
238 htmlf("<br/>deleted file mode %.6o", mode1);
239
240 if (!subproject) {
241 abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV));
242 abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV));
243 htmlf("<br/>index %s..%s", abbrev1, abbrev2);
244 free(abbrev1);
245 free(abbrev2);
246 if (mode1 != 0 && mode2 != 0) {
247 htmlf(" %.6o", mode1);
248 if (mode2 != mode1)
249 htmlf("..%.6o", mode2);
250 }
Michael Halstead62a40c72012-11-14 12:41:01 -0800251 if (is_null_sha1(sha1)) {
252 path1 = "dev/null";
253 html("<br/>--- /");
254 } else
255 html("<br/>--- a/");
Lars Hjemlie238ebe2007-10-01 12:30:29 +0200256 if (mode1 != 0)
Lars Hjemlid14d77f2008-02-16 11:53:40 +0100257 cgit_tree_link(path1, NULL, NULL, ctx.qry.head,
Lars Hjemlie238ebe2007-10-01 12:30:29 +0200258 sha1_to_hex(old_rev_sha1), path1);
259 else
260 html_txt(path1);
Michael Halstead62a40c72012-11-14 12:41:01 -0800261 if (is_null_sha1(sha2)) {
262 path2 = "dev/null";
263 html("<br/>+++ /");
264 } else
265 html("<br/>+++ b/");
Lars Hjemlie238ebe2007-10-01 12:30:29 +0200266 if (mode2 != 0)
Lars Hjemlid14d77f2008-02-16 11:53:40 +0100267 cgit_tree_link(path2, NULL, NULL, ctx.qry.head,
Lars Hjemlie238ebe2007-10-01 12:30:29 +0200268 sha1_to_hex(new_rev_sha1), path2);
269 else
270 html_txt(path2);
Lars Hjemlif4f13392007-05-16 04:21:06 +0200271 }
Lars Hjemlia342ac62007-05-14 18:31:05 +0200272 html("</div>");
273}
274
Lars Hjemli6a8749d2007-05-13 23:13:12 +0200275static void filepair_cb(struct diff_filepair *pair)
276{
Lars Hjemlic495cf02009-01-31 10:40:40 +0100277 unsigned long old_size = 0;
278 unsigned long new_size = 0;
279 int binary = 0;
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200280 linediff_fn print_line_fn = print_line;
Lars Hjemlic495cf02009-01-31 10:40:40 +0100281
Bernhard Reutner-Fischere52040b2010-12-23 12:47:55 +0100282 current_filepair = pair;
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200283 if (use_ssdiff) {
Ragnar Ouchterlony207cc342009-09-15 19:44:37 +0200284 cgit_ssdiff_header_begin();
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200285 print_line_fn = cgit_ssdiff_line_cb;
286 }
Ragnar Ouchterlony207cc342009-09-15 19:44:37 +0200287 header(pair->one->sha1, pair->one->path, pair->one->mode,
288 pair->two->sha1, pair->two->path, pair->two->mode);
289 if (use_ssdiff)
290 cgit_ssdiff_header_end();
Jeffrey C. Olliee651cb02007-06-04 12:28:56 -0500291 if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) {
292 if (S_ISGITLINK(pair->one->mode))
Ragnar Ouchterlony207cc342009-09-15 19:44:37 +0200293 print_line_fn(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52);
Jeffrey C. Olliee651cb02007-06-04 12:28:56 -0500294 if (S_ISGITLINK(pair->two->mode))
Ragnar Ouchterlony207cc342009-09-15 19:44:37 +0200295 print_line_fn(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52);
Ragnar Ouchterlony4a198e42009-09-16 18:56:26 +0200296 if (use_ssdiff)
297 cgit_ssdiff_footer();
Lars Hjemlif4f13392007-05-16 04:21:06 +0200298 return;
299 }
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200300 if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,
Johan Herland2cc8b992010-06-24 17:52:57 +0200301 &new_size, &binary, ctx.qry.context,
302 ctx.qry.ignorews, print_line_fn))
Lars Hjemli6a8749d2007-05-13 23:13:12 +0200303 cgit_print_error("Error running diff");
Ragnar Ouchterlony4a198e42009-09-16 18:56:26 +0200304 if (binary) {
305 if (use_ssdiff)
306 html("<tr><td colspan='4'>Binary files differ</td></tr>");
307 else
308 html("Binary files differ");
309 }
Ragnar Ouchterlony40e174d2009-09-13 19:36:35 +0200310 if (use_ssdiff)
311 cgit_ssdiff_footer();
Lars Hjemli6a8749d2007-05-13 23:13:12 +0200312}
313
Lars Hjemli962a2482011-03-06 23:59:56 +0100314void cgit_print_diff_ctrls()
315{
316 int i, curr;
317
318 html("<div class='cgit-panel'>");
319 html("<b>diff options</b>");
320 html("<form method='get' action='.'>");
321 cgit_add_hidden_formfields(1, 0, ctx.qry.page);
322 html("<table>");
323 html("<tr><td colspan='2'/></tr>");
324 html("<tr>");
325 html("<td class='label'>context:</td>");
326 html("<td class='ctrl'>");
327 html("<select name='context' onchange='this.form.submit();'>");
328 curr = ctx.qry.context;
329 if (!curr)
330 curr = 3;
331 for (i = 1; i <= 10; i++)
332 html_intoption(i, fmt("%d", i), curr);
333 for (i = 15; i <= 40; i += 5)
334 html_intoption(i, fmt("%d", i), curr);
335 html("</select>");
336 html("</td>");
337 html("</tr><tr>");
338 html("<td class='label'>space:</td>");
339 html("<td class='ctrl'>");
340 html("<select name='ignorews' onchange='this.form.submit();'>");
341 html_intoption(0, "include", ctx.qry.ignorews);
342 html_intoption(1, "ignore", ctx.qry.ignorews);
343 html("</select>");
344 html("</td>");
345 html("</tr><tr>");
346 html("<td class='label'>mode:</td>");
347 html("<td class='ctrl'>");
348 html("<select name='ss' onchange='this.form.submit();'>");
Tim Chen19574252012-01-03 16:09:59 +0000349 curr = ctx.qry.has_ssdiff ? ctx.qry.ssdiff : ctx.cfg.ssdiff;
Lars Hjemli962a2482011-03-06 23:59:56 +0100350 html_intoption(0, "unified", curr);
351 html_intoption(1, "ssdiff", curr);
352 html("</select></td></tr>");
353 html("<tr><td/><td class='ctrl'>");
354 html("<noscript><input type='submit' value='reload'/></noscript>");
355 html("</td></tr></table>");
356 html("</form>");
357 html("</div>");
358}
359
360void cgit_print_diff(const char *new_rev, const char *old_rev,
Lukas Fleischer9003cc12013-08-14 10:50:32 +0200361 const char *prefix, int show_ctrls, int raw)
Lars Hjemli36aba002006-12-20 22:48:27 +0100362{
Lars Hjemli4a0be582007-06-17 18:12:03 +0200363 struct commit *commit, *commit2;
Lars Hjemlif9ff7df2007-05-16 00:58:35 +0200364
Lars Hjemli4a0be582007-06-17 18:12:03 +0200365 if (!new_rev)
Lars Hjemlid14d77f2008-02-16 11:53:40 +0100366 new_rev = ctx.qry.head;
Lukas Fleischer01db0832013-08-20 18:56:12 +0200367 if (get_sha1(new_rev, new_rev_sha1)) {
John Keepinged5bd302013-04-06 11:23:52 +0100368 cgit_print_error("Bad object name: %s", new_rev);
Lars Hjemli4a0be582007-06-17 18:12:03 +0200369 return;
370 }
Lars Hjemlie238ebe2007-10-01 12:30:29 +0200371 commit = lookup_commit_reference(new_rev_sha1);
Lukas Fleischer9afc8832011-04-05 10:38:53 +0200372 if (!commit || parse_commit(commit)) {
John Keepinged5bd302013-04-06 11:23:52 +0100373 cgit_print_error("Bad commit: %s", sha1_to_hex(new_rev_sha1));
Lukas Fleischer9afc8832011-04-05 10:38:53 +0200374 return;
375 }
Lars Hjemli36aba002006-12-20 22:48:27 +0100376
Lukas Fleischer01db0832013-08-20 18:56:12 +0200377 if (old_rev) {
378 if (get_sha1(old_rev, old_rev_sha1)) {
379 cgit_print_error("Bad object name: %s", old_rev);
Lars Hjemli6a8749d2007-05-13 23:13:12 +0200380 return;
381 }
Lukas Fleischer01db0832013-08-20 18:56:12 +0200382 } 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
388 if (!is_null_sha1(old_rev_sha1)) {
Lars Hjemlie238ebe2007-10-01 12:30:29 +0200389 commit2 = lookup_commit_reference(old_rev_sha1);
Lukas Fleischer9afc8832011-04-05 10:38:53 +0200390 if (!commit2 || parse_commit(commit2)) {
John Keepinged5bd302013-04-06 11:23:52 +0100391 cgit_print_error("Bad commit: %s", sha1_to_hex(old_rev_sha1));
Lukas Fleischer9afc8832011-04-05 10:38:53 +0200392 return;
393 }
Lars Hjemli6a8749d2007-05-13 23:13:12 +0200394 }
Ragnar Ouchterlonyc358aa32009-09-14 20:19:02 +0200395
Lukas Fleischer9003cc12013-08-14 10:50:32 +0200396 if (raw) {
397 ctx.page.mimetype = "text/plain";
398 cgit_print_http_headers(&ctx);
399 cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb_raw,
400 prefix, 0);
401 return;
402 }
403
Tim Chenf2ced532012-01-03 16:02:14 +0000404 use_ssdiff = ctx.qry.has_ssdiff ? ctx.qry.ssdiff : ctx.cfg.ssdiff;
Ragnar Ouchterlonyc358aa32009-09-14 20:19:02 +0200405
Lars Hjemli962a2482011-03-06 23:59:56 +0100406 if (show_ctrls)
407 cgit_print_diff_ctrls();
408
Johan Herlandc46e4682010-06-10 01:09:31 +0200409 cgit_print_diffstat(old_rev_sha1, new_rev_sha1, prefix);
Lars Hjemlife1230d2008-04-24 23:32:02 +0200410
Ragnar Ouchterlony207cc342009-09-15 19:44:37 +0200411 if (use_ssdiff) {
412 html("<table summary='ssdiff' class='ssdiff'>");
413 } else {
414 html("<table summary='diff' class='diff'>");
415 html("<tr><td>");
416 }
Johan Herland2cc8b992010-06-24 17:52:57 +0200417 cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix,
418 ctx.qry.ignorews);
Ragnar Ouchterlony207cc342009-09-15 19:44:37 +0200419 if (!use_ssdiff)
420 html("</td></tr>");
Ondrej Jirman0928d882007-05-26 01:14:25 +0200421 html("</table>");
Lars Hjemli36aba002006-12-20 22:48:27 +0100422}