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
13unsigned char old_rev_sha1[20];
14unsigned char new_rev_sha1[20];
15
16static int files, slots;
17static int total_adds, total_rems, max_changes;
18static int lines_added, lines_removed;
19
20static struct fileinfo {
21 char status;
22 unsigned char old_sha1[20];
23 unsigned char new_sha1[20];
24 unsigned short old_mode;
25 unsigned short new_mode;
26 char *old_path;
27 char *new_path;
28 unsigned int added;
29 unsigned int removed;
30} *items;
31
32
33static void print_fileinfo(struct fileinfo *info)
34{
35 char *class;
36
37 switch (info->status) {
38 case DIFF_STATUS_ADDED:
39 class = "add";
40 break;
41 case DIFF_STATUS_COPIED:
42 class = "cpy";
43 break;
44 case DIFF_STATUS_DELETED:
45 class = "del";
46 break;
47 case DIFF_STATUS_MODIFIED:
48 class = "upd";
49 break;
50 case DIFF_STATUS_RENAMED:
51 class = "mov";
52 break;
53 case DIFF_STATUS_TYPE_CHANGED:
54 class = "typ";
55 break;
56 case DIFF_STATUS_UNKNOWN:
57 class = "unk";
58 break;
59 case DIFF_STATUS_UNMERGED:
60 class = "stg";
61 break;
62 default:
63 die("bug: unhandled diff status %c", info->status);
64 }
65
66 html("<tr>");
67 htmlf("<td class='mode'>");
68 if (is_null_sha1(info->new_sha1)) {
69 cgit_print_filemode(info->old_mode);
70 } else {
71 cgit_print_filemode(info->new_mode);
72 }
73
74 if (info->old_mode != info->new_mode &&
75 !is_null_sha1(info->old_sha1) &&
76 !is_null_sha1(info->new_sha1)) {
77 html("<span class='modechange'>[");
78 cgit_print_filemode(info->old_mode);
79 html("]</span>");
80 }
81 htmlf("</td><td class='%s'>", class);
82 cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.sha1,
83 ctx.qry.sha2, info->new_path);
84 if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED)
85 htmlf(" (%s from %s)",
86 info->status == DIFF_STATUS_COPIED ? "copied" : "renamed",
87 info->old_path);
88 html("</td><td class='right'>");
89 htmlf("%d", info->added + info->removed);
90 html("</td><td class='graph'>");
91 htmlf("<table summary='file diffstat' width='%d%%'><tr>", (max_changes > 100 ? 100 : max_changes));
92 htmlf("<td class='add' style='width: %.1f%%;'/>",
93 info->added * 100.0 / max_changes);
94 htmlf("<td class='rem' style='width: %.1f%%;'/>",
95 info->removed * 100.0 / max_changes);
96 htmlf("<td class='none' style='width: %.1f%%;'/>",
97 (max_changes - info->removed - info->added) * 100.0 / max_changes);
98 html("</tr></table></td></tr>\n");
99}
100
101static void count_diff_lines(char *line, int len)
102{
103 if (line && (len > 0)) {
104 if (line[0] == '+')
105 lines_added++;
106 else if (line[0] == '-')
107 lines_removed++;
108 }
109}
110
111static void inspect_filepair(struct diff_filepair *pair)
112{
113 files++;
114 lines_added = 0;
115 lines_removed = 0;
116 cgit_diff_files(pair->one->sha1, pair->two->sha1, count_diff_lines);
117 if (files >= slots) {
118 if (slots == 0)
119 slots = 4;
120 else
121 slots = slots * 2;
122 items = xrealloc(items, slots * sizeof(struct fileinfo));
123 }
124 items[files-1].status = pair->status;
125 hashcpy(items[files-1].old_sha1, pair->one->sha1);
126 hashcpy(items[files-1].new_sha1, pair->two->sha1);
127 items[files-1].old_mode = pair->one->mode;
128 items[files-1].new_mode = pair->two->mode;
129 items[files-1].old_path = xstrdup(pair->one->path);
130 items[files-1].new_path = xstrdup(pair->two->path);
131 items[files-1].added = lines_added;
132 items[files-1].removed = lines_removed;
133 if (lines_added + lines_removed > max_changes)
134 max_changes = lines_added + lines_removed;
135 total_adds += lines_added;
136 total_rems += lines_removed;
137}
138
139void cgit_print_diffstat(const unsigned char *old_sha1,
140 const unsigned char *new_sha1)
141{
142 int i;
143
144 html("<div class='diffstat-header'>");
145 cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.sha1,
146 ctx.qry.sha2, NULL);
147 html("</div>");
148 html("<table summary='diffstat' class='diffstat'>");
149 max_changes = 0;
150 cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, NULL);
151 for(i = 0; i<files; i++)
152 print_fileinfo(&items[i]);
153 html("</table>");
154 html("<div class='diffstat-summary'>");
155 htmlf("%d files changed, %d insertions, %d deletions",
156 files, total_adds, total_rems);
157 html("</div>");
158}
159
160
161/*
162 * print a single line returned from xdiff
163 */
164static void print_line(char *line, int len)
165{
166 char *class = "ctx";
167 char c = line[len-1];
168
169 if (line[0] == '+')
170 class = "add";
171 else if (line[0] == '-')
172 class = "del";
173 else if (line[0] == '@')
174 class = "hunk";
175
176 htmlf("<div class='%s'>", class);
177 line[len-1] = '\0';
178 html_txt(line);
179 html("</div>");
180 line[len-1] = c;
181}
182
183static void header(unsigned char *sha1, char *path1, int mode1,
184 unsigned char *sha2, char *path2, int mode2)
185{
186 char *abbrev1, *abbrev2;
187 int subproject;
188
189 subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2));
190 html("<div class='head'>");
191 html("diff --git a/");
192 html_txt(path1);
193 html(" b/");
194 html_txt(path2);
195
196 if (is_null_sha1(sha1))
197 path1 = "dev/null";
198 if (is_null_sha1(sha2))
199 path2 = "dev/null";
200
201 if (mode1 == 0)
202 htmlf("<br/>new file mode %.6o", mode2);
203
204 if (mode2 == 0)
205 htmlf("<br/>deleted file mode %.6o", mode1);
206
207 if (!subproject) {
208 abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV));
209 abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV));
210 htmlf("<br/>index %s..%s", abbrev1, abbrev2);
211 free(abbrev1);
212 free(abbrev2);
213 if (mode1 != 0 && mode2 != 0) {
214 htmlf(" %.6o", mode1);
215 if (mode2 != mode1)
216 htmlf("..%.6o", mode2);
217 }
218 html("<br/>--- a/");
219 if (mode1 != 0)
220 cgit_tree_link(path1, NULL, NULL, ctx.qry.head,
221 sha1_to_hex(old_rev_sha1), path1);
222 else
223 html_txt(path1);
224 html("<br/>+++ b/");
225 if (mode2 != 0)
226 cgit_tree_link(path2, NULL, NULL, ctx.qry.head,
227 sha1_to_hex(new_rev_sha1), path2);
228 else
229 html_txt(path2);
230 }
231 html("</div>");
232}
233
234static void filepair_cb(struct diff_filepair *pair)
235{
236 header(pair->one->sha1, pair->one->path, pair->one->mode,
237 pair->two->sha1, pair->two->path, pair->two->mode);
238 if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) {
239 if (S_ISGITLINK(pair->one->mode))
240 print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52);
241 if (S_ISGITLINK(pair->two->mode))
242 print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52);
243 return;
244 }
245 if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line))
246 cgit_print_error("Error running diff");
247}
248
249void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefix)
250{
251 enum object_type type;
252 unsigned long size;
253 struct commit *commit, *commit2;
254
255 if (!new_rev)
256 new_rev = ctx.qry.head;
257 get_sha1(new_rev, new_rev_sha1);
258 type = sha1_object_info(new_rev_sha1, &size);
259 if (type == OBJ_BAD) {
260 cgit_print_error(fmt("Bad object name: %s", new_rev));
261 return;
262 }
263 commit = lookup_commit_reference(new_rev_sha1);
264 if (!commit || parse_commit(commit))
265 cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(new_rev_sha1)));
266
267 if (old_rev)
268 get_sha1(old_rev, old_rev_sha1);
269 else if (commit->parents && commit->parents->item)
270 hashcpy(old_rev_sha1, commit->parents->item->object.sha1);
271 else
272 hashclr(old_rev_sha1);
273
274 if (!is_null_sha1(old_rev_sha1)) {
275 type = sha1_object_info(old_rev_sha1, &size);
276 if (type == OBJ_BAD) {
277 cgit_print_error(fmt("Bad object name: %s", sha1_to_hex(old_rev_sha1)));
278 return;
279 }
280 commit2 = lookup_commit_reference(old_rev_sha1);
281 if (!commit2 || parse_commit(commit2))
282 cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(old_rev_sha1)));
283 }
284 cgit_print_diffstat(old_rev_sha1, new_rev_sha1);
285
286 html("<table summary='diff' class='diff'>");
287 html("<tr><td>");
288 cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix);
289 html("</td></tr>");
290 html("</table>");
291}