]> git.cameronkatri.com Git - cgit.git/blob - ui-diff.c
ui-repolist: enable filtering of repos by path
[cgit.git] / ui-diff.c
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
13 unsigned char old_rev_sha1[20];
14 unsigned char new_rev_sha1[20];
15
16 static int files, slots;
17 static int total_adds, total_rems, max_changes;
18 static int lines_added, lines_removed;
19 static char *curr_rev;
20
21 static 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
34 static 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
102 static 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
112 static 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
140 void 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 curr_rev = xstrdup(sha1_to_hex(new_sha1));
149 cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, NULL);
150 for(i = 0; i<files; i++)
151 print_fileinfo(&items[i]);
152 html("</table>");
153 html("<div class='diffstat-summary'>");
154 htmlf("%d files changed, %d insertions, %d deletions",
155 files, total_adds, total_rems);
156 html("</div>");
157 }
158
159
160 /*
161 * print a single line returned from xdiff
162 */
163 static void print_line(char *line, int len)
164 {
165 char *class = "ctx";
166 char c = line[len-1];
167
168 if (line[0] == '+')
169 class = "add";
170 else if (line[0] == '-')
171 class = "del";
172 else if (line[0] == '@')
173 class = "hunk";
174
175 htmlf("<div class='%s'>", class);
176 line[len-1] = '\0';
177 html_txt(line);
178 html("</div>");
179 line[len-1] = c;
180 }
181
182 static void header(unsigned char *sha1, char *path1, int mode1,
183 unsigned char *sha2, char *path2, int mode2)
184 {
185 char *abbrev1, *abbrev2;
186 int subproject;
187
188 subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2));
189 html("<div class='head'>");
190 html("diff --git a/");
191 html_txt(path1);
192 html(" b/");
193 html_txt(path2);
194
195 if (is_null_sha1(sha1))
196 path1 = "dev/null";
197 if (is_null_sha1(sha2))
198 path2 = "dev/null";
199
200 if (mode1 == 0)
201 htmlf("<br/>new file mode %.6o", mode2);
202
203 if (mode2 == 0)
204 htmlf("<br/>deleted file mode %.6o", mode1);
205
206 if (!subproject) {
207 abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV));
208 abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV));
209 htmlf("<br/>index %s..%s", abbrev1, abbrev2);
210 free(abbrev1);
211 free(abbrev2);
212 if (mode1 != 0 && mode2 != 0) {
213 htmlf(" %.6o", mode1);
214 if (mode2 != mode1)
215 htmlf("..%.6o", mode2);
216 }
217 html("<br/>--- a/");
218 if (mode1 != 0)
219 cgit_tree_link(path1, NULL, NULL, ctx.qry.head,
220 sha1_to_hex(old_rev_sha1), path1);
221 else
222 html_txt(path1);
223 html("<br/>+++ b/");
224 if (mode2 != 0)
225 cgit_tree_link(path2, NULL, NULL, ctx.qry.head,
226 sha1_to_hex(new_rev_sha1), path2);
227 else
228 html_txt(path2);
229 }
230 html("</div>");
231 }
232
233 static void filepair_cb(struct diff_filepair *pair)
234 {
235 header(pair->one->sha1, pair->one->path, pair->one->mode,
236 pair->two->sha1, pair->two->path, pair->two->mode);
237 if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) {
238 if (S_ISGITLINK(pair->one->mode))
239 print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52);
240 if (S_ISGITLINK(pair->two->mode))
241 print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52);
242 return;
243 }
244 if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line))
245 cgit_print_error("Error running diff");
246 }
247
248 void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefix)
249 {
250 enum object_type type;
251 unsigned long size;
252 struct commit *commit, *commit2;
253
254 if (!new_rev)
255 new_rev = ctx.qry.head;
256 get_sha1(new_rev, new_rev_sha1);
257 type = sha1_object_info(new_rev_sha1, &size);
258 if (type == OBJ_BAD) {
259 cgit_print_error(fmt("Bad object name: %s", new_rev));
260 return;
261 }
262 commit = lookup_commit_reference(new_rev_sha1);
263 if (!commit || parse_commit(commit))
264 cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(new_rev_sha1)));
265
266 if (old_rev)
267 get_sha1(old_rev, old_rev_sha1);
268 else if (commit->parents && commit->parents->item)
269 hashcpy(old_rev_sha1, commit->parents->item->object.sha1);
270 else
271 hashclr(old_rev_sha1);
272
273 if (!is_null_sha1(old_rev_sha1)) {
274 type = sha1_object_info(old_rev_sha1, &size);
275 if (type == OBJ_BAD) {
276 cgit_print_error(fmt("Bad object name: %s", sha1_to_hex(old_rev_sha1)));
277 return;
278 }
279 commit2 = lookup_commit_reference(old_rev_sha1);
280 if (!commit2 || parse_commit(commit2))
281 cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(old_rev_sha1)));
282 }
283 cgit_print_diffstat(old_rev_sha1, new_rev_sha1);
284
285 html("<table summary='diff' class='diff'>");
286 html("<tr><td>");
287 cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix);
288 html("</td></tr>");
289 html("</table>");
290 }