blob: 625b5fddd17418ec78dec2b736a03a2a1f1a8eed [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"
Lars Hjemlib1f9b9c2008-02-23 22:45:33 +010010#include "html.h"
Lars Hjemlia4d1ca12008-03-24 16:50:57 +010011#include "ui-shared.h"
Lars Hjemli36aba002006-12-20 22:48:27 +010012
Lars Hjemlie238ebe2007-10-01 12:30:29 +020013unsigned char old_rev_sha1[20];
14unsigned char new_rev_sha1[20];
15
Lars Hjemlife1230d2008-04-24 23:32:02 +020016static int files, slots;
17static int total_adds, total_rems, max_changes;
18static int lines_added, lines_removed;
19static char *curr_rev;
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} *items;
32
33
34static void print_fileinfo(struct fileinfo *info)
35{
36 char *class;
37
38 switch (info->status) {
39 case DIFF_STATUS_ADDED:
40 class = "add";
41 break;
42 case DIFF_STATUS_COPIED:
43 class = "cpy";
44 break;
45 case DIFF_STATUS_DELETED:
46 class = "del";
47 break;
48 case DIFF_STATUS_MODIFIED:
49 class = "upd";
50 break;
51 case DIFF_STATUS_RENAMED:
52 class = "mov";
53 break;
54 case DIFF_STATUS_TYPE_CHANGED:
55 class = "typ";
56 break;
57 case DIFF_STATUS_UNKNOWN:
58 class = "unk";
59 break;
60 case DIFF_STATUS_UNMERGED:
61 class = "stg";
62 break;
63 default:
64 die("bug: unhandled diff status %c", info->status);
65 }
66
67 html("<tr>");
68 htmlf("<td class='mode'>");
69 if (is_null_sha1(info->new_sha1)) {
70 cgit_print_filemode(info->old_mode);
71 } else {
72 cgit_print_filemode(info->new_mode);
73 }
74
75 if (info->old_mode != info->new_mode &&
76 !is_null_sha1(info->old_sha1) &&
77 !is_null_sha1(info->new_sha1)) {
78 html("<span class='modechange'>[");
79 cgit_print_filemode(info->old_mode);
80 html("]</span>");
81 }
82 htmlf("</td><td class='%s'>", class);
83 cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, curr_rev,
84 NULL, info->new_path);
85 if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED)
86 htmlf(" (%s from %s)",
87 info->status == DIFF_STATUS_COPIED ? "copied" : "renamed",
88 info->old_path);
89 html("</td><td class='right'>");
90 htmlf("%d", info->added + info->removed);
91 html("</td><td class='graph'>");
92 htmlf("<table summary='file diffstat' width='%d%%'><tr>", (max_changes > 100 ? 100 : max_changes));
93 htmlf("<td class='add' style='width: %.1f%%;'/>",
94 info->added * 100.0 / max_changes);
95 htmlf("<td class='rem' style='width: %.1f%%;'/>",
96 info->removed * 100.0 / max_changes);
97 htmlf("<td class='none' style='width: %.1f%%;'/>",
98 (max_changes - info->removed - info->added) * 100.0 / max_changes);
99 html("</tr></table></td></tr>\n");
100}
101
102static void count_diff_lines(char *line, int len)
103{
104 if (line && (len > 0)) {
105 if (line[0] == '+')
106 lines_added++;
107 else if (line[0] == '-')
108 lines_removed++;
109 }
110}
111
112static void inspect_filepair(struct diff_filepair *pair)
113{
114 files++;
115 lines_added = 0;
116 lines_removed = 0;
117 cgit_diff_files(pair->one->sha1, pair->two->sha1, count_diff_lines);
118 if (files >= slots) {
119 if (slots == 0)
120 slots = 4;
121 else
122 slots = slots * 2;
123 items = xrealloc(items, slots * sizeof(struct fileinfo));
124 }
125 items[files-1].status = pair->status;
126 hashcpy(items[files-1].old_sha1, pair->one->sha1);
127 hashcpy(items[files-1].new_sha1, pair->two->sha1);
128 items[files-1].old_mode = pair->one->mode;
129 items[files-1].new_mode = pair->two->mode;
130 items[files-1].old_path = xstrdup(pair->one->path);
131 items[files-1].new_path = xstrdup(pair->two->path);
132 items[files-1].added = lines_added;
133 items[files-1].removed = lines_removed;
134 if (lines_added + lines_removed > max_changes)
135 max_changes = lines_added + lines_removed;
136 total_adds += lines_added;
137 total_rems += lines_removed;
138}
139
140void cgit_print_diffstat(const unsigned char *old_sha1,
141 const unsigned char *new_sha1)
142{
143 int i;
144
145 html("<div class='diffstat-header'>Diffstat</div>");
146 html("<table summary='diffstat' class='diffstat'>");
147 max_changes = 0;
148 cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, NULL);
149 for(i = 0; i<files; i++)
150 print_fileinfo(&items[i]);
151 html("</table>");
152 html("<div class='diffstat-summary'>");
153 htmlf("%d files changed, %d insertions, %d deletions",
154 files, total_adds, total_rems);
155 html("</div>");
156}
157
158
Lars Hjemli36aba002006-12-20 22:48:27 +0100159/*
160 * print a single line returned from xdiff
161 */
162static void print_line(char *line, int len)
163{
164 char *class = "ctx";
165 char c = line[len-1];
166
167 if (line[0] == '+')
168 class = "add";
169 else if (line[0] == '-')
170 class = "del";
171 else if (line[0] == '@')
172 class = "hunk";
173
174 htmlf("<div class='%s'>", class);
175 line[len-1] = '\0';
176 html_txt(line);
177 html("</div>");
178 line[len-1] = c;
179}
180
Lars Hjemlif4f13392007-05-16 04:21:06 +0200181static void header(unsigned char *sha1, char *path1, int mode1,
182 unsigned char *sha2, char *path2, int mode2)
Lars Hjemlia342ac62007-05-14 18:31:05 +0200183{
184 char *abbrev1, *abbrev2;
Lars Hjemlif4f13392007-05-16 04:21:06 +0200185 int subproject;
186
Jeffrey C. Olliee651cb02007-06-04 12:28:56 -0500187 subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2));
Lars Hjemlia342ac62007-05-14 18:31:05 +0200188 html("<div class='head'>");
189 html("diff --git a/");
190 html_txt(path1);
191 html(" b/");
192 html_txt(path2);
Lars Hjemlif4f13392007-05-16 04:21:06 +0200193
194 if (is_null_sha1(sha1))
195 path1 = "dev/null";
196 if (is_null_sha1(sha2))
197 path2 = "dev/null";
198
199 if (mode1 == 0)
200 htmlf("<br/>new file mode %.6o", mode2);
201
202 if (mode2 == 0)
203 htmlf("<br/>deleted file mode %.6o", mode1);
204
205 if (!subproject) {
206 abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV));
207 abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV));
208 htmlf("<br/>index %s..%s", abbrev1, abbrev2);
209 free(abbrev1);
210 free(abbrev2);
211 if (mode1 != 0 && mode2 != 0) {
212 htmlf(" %.6o", mode1);
213 if (mode2 != mode1)
214 htmlf("..%.6o", mode2);
215 }
216 html("<br/>--- a/");
Lars Hjemlie238ebe2007-10-01 12:30:29 +0200217 if (mode1 != 0)
Lars Hjemlid14d77f2008-02-16 11:53:40 +0100218 cgit_tree_link(path1, NULL, NULL, ctx.qry.head,
Lars Hjemlie238ebe2007-10-01 12:30:29 +0200219 sha1_to_hex(old_rev_sha1), path1);
220 else
221 html_txt(path1);
Lars Hjemlif4f13392007-05-16 04:21:06 +0200222 html("<br/>+++ b/");
Lars Hjemlie238ebe2007-10-01 12:30:29 +0200223 if (mode2 != 0)
Lars Hjemlid14d77f2008-02-16 11:53:40 +0100224 cgit_tree_link(path2, NULL, NULL, ctx.qry.head,
Lars Hjemlie238ebe2007-10-01 12:30:29 +0200225 sha1_to_hex(new_rev_sha1), path2);
226 else
227 html_txt(path2);
Lars Hjemlif4f13392007-05-16 04:21:06 +0200228 }
Lars Hjemlia342ac62007-05-14 18:31:05 +0200229 html("</div>");
230}
231
Lars Hjemli6a8749d2007-05-13 23:13:12 +0200232static void filepair_cb(struct diff_filepair *pair)
233{
Lars Hjemlif4f13392007-05-16 04:21:06 +0200234 header(pair->one->sha1, pair->one->path, pair->one->mode,
235 pair->two->sha1, pair->two->path, pair->two->mode);
Jeffrey C. Olliee651cb02007-06-04 12:28:56 -0500236 if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) {
237 if (S_ISGITLINK(pair->one->mode))
Lars Hjemlif4f13392007-05-16 04:21:06 +0200238 print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52);
Jeffrey C. Olliee651cb02007-06-04 12:28:56 -0500239 if (S_ISGITLINK(pair->two->mode))
Lars Hjemlif4f13392007-05-16 04:21:06 +0200240 print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52);
241 return;
242 }
Lars Hjemli6a8749d2007-05-13 23:13:12 +0200243 if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line))
244 cgit_print_error("Error running diff");
Lars Hjemli6a8749d2007-05-13 23:13:12 +0200245}
246
Lars Hjemli1a6025b2007-10-01 11:46:38 +0200247void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefix)
Lars Hjemli36aba002006-12-20 22:48:27 +0100248{
Lars Hjemli6a8749d2007-05-13 23:13:12 +0200249 enum object_type type;
250 unsigned long size;
Lars Hjemli4a0be582007-06-17 18:12:03 +0200251 struct commit *commit, *commit2;
Lars Hjemlif9ff7df2007-05-16 00:58:35 +0200252
Lars Hjemli4a0be582007-06-17 18:12:03 +0200253 if (!new_rev)
Lars Hjemlid14d77f2008-02-16 11:53:40 +0100254 new_rev = ctx.qry.head;
Lars Hjemlie238ebe2007-10-01 12:30:29 +0200255 get_sha1(new_rev, new_rev_sha1);
256 type = sha1_object_info(new_rev_sha1, &size);
Lars Hjemli4a0be582007-06-17 18:12:03 +0200257 if (type == OBJ_BAD) {
258 cgit_print_error(fmt("Bad object name: %s", new_rev));
259 return;
260 }
261 if (type != OBJ_COMMIT) {
262 cgit_print_error(fmt("Unhandled object type: %s",
263 typename(type)));
Lars Hjemlif9ff7df2007-05-16 00:58:35 +0200264 return;
265 }
Lars Hjemli36aba002006-12-20 22:48:27 +0100266
Lars Hjemlie238ebe2007-10-01 12:30:29 +0200267 commit = lookup_commit_reference(new_rev_sha1);
Lars Hjemli4a0be582007-06-17 18:12:03 +0200268 if (!commit || parse_commit(commit))
Lars Hjemlie238ebe2007-10-01 12:30:29 +0200269 cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(new_rev_sha1)));
Lars Hjemli36aba002006-12-20 22:48:27 +0100270
Lars Hjemli4a0be582007-06-17 18:12:03 +0200271 if (old_rev)
Lars Hjemlie238ebe2007-10-01 12:30:29 +0200272 get_sha1(old_rev, old_rev_sha1);
Lars Hjemli4a0be582007-06-17 18:12:03 +0200273 else if (commit->parents && commit->parents->item)
Lars Hjemlie238ebe2007-10-01 12:30:29 +0200274 hashcpy(old_rev_sha1, commit->parents->item->object.sha1);
Lars Hjemli4a0be582007-06-17 18:12:03 +0200275 else
Lars Hjemlie238ebe2007-10-01 12:30:29 +0200276 hashclr(old_rev_sha1);
Lars Hjemli4a0be582007-06-17 18:12:03 +0200277
Lars Hjemlie238ebe2007-10-01 12:30:29 +0200278 if (!is_null_sha1(old_rev_sha1)) {
279 type = sha1_object_info(old_rev_sha1, &size);
Lars Hjemli6a8749d2007-05-13 23:13:12 +0200280 if (type == OBJ_BAD) {
Lars Hjemlie238ebe2007-10-01 12:30:29 +0200281 cgit_print_error(fmt("Bad object name: %s", sha1_to_hex(old_rev_sha1)));
Lars Hjemli6a8749d2007-05-13 23:13:12 +0200282 return;
283 }
Lars Hjemlie238ebe2007-10-01 12:30:29 +0200284 commit2 = lookup_commit_reference(old_rev_sha1);
Lars Hjemli4a0be582007-06-17 18:12:03 +0200285 if (!commit2 || parse_commit(commit2))
Lars Hjemlie238ebe2007-10-01 12:30:29 +0200286 cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(old_rev_sha1)));
Lars Hjemli6a8749d2007-05-13 23:13:12 +0200287 }
Lars Hjemlife1230d2008-04-24 23:32:02 +0200288 cgit_print_diffstat(old_rev_sha1, new_rev_sha1);
289
Lars Hjemli29154832007-11-11 13:04:28 +0100290 html("<table summary='diff' class='diff'>");
Lars Hjemli4a0be582007-06-17 18:12:03 +0200291 html("<tr><td>");
Lars Hjemlie238ebe2007-10-01 12:30:29 +0200292 cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix);
Lars Hjemli4a6201e2007-06-05 11:44:47 +0200293 html("</td></tr>");
Ondrej Jirman0928d882007-05-26 01:14:25 +0200294 html("</table>");
Lars Hjemli36aba002006-12-20 22:48:27 +0100295}