summaryrefslogtreecommitdiffabout
authorJohan Herland <johan@herland.net>2010-06-24 15:53:20 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2010-07-18 08:54:02 (UTC)
commit72ef913514288bd2aae23509581097bfd3edf8c4 (patch) (unidiff)
tree3a8b48aa0ebcc74a7e8b7f05f964432c6d577921
parent2cc8b99f083014c58d8937bfa4dcd2bc47cd7e58 (diff)
downloadcgit-72ef913514288bd2aae23509581097bfd3edf8c4.zip
cgit-72ef913514288bd2aae23509581097bfd3edf8c4.tar.gz
cgit-72ef913514288bd2aae23509581097bfd3edf8c4.tar.bz2
ui-diff: Add link to ignore/show whitespace changes in diffs
Add a link to the "Diffstat" line to ignore/show whitespace changes in the generated diff. To support this, cgit_commit_link() and cgit_diff_link() has learned to preserve the ctx.qry.ignorews variable. Signed-off-by: Johan Herland <johan@herland.net>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ui-diff.c5
-rw-r--r--ui-shared.c10
2 files changed, 15 insertions, 0 deletions
diff --git a/ui-diff.c b/ui-diff.c
index 1656b77..0dcabe9 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -1,366 +1,371 @@
1/* ui-diff.c: show diff between two blobs 1/* ui-diff.c: show diff between two blobs
2 * 2 *
3 * Copyright (C) 2006 Lars Hjemli 3 * Copyright (C) 2006 Lars Hjemli
4 * 4 *
5 * Licensed under GNU General Public License v2 5 * Licensed under GNU General Public License v2
6 * (see COPYING for full license text) 6 * (see COPYING for full license text)
7 */ 7 */
8 8
9#include "cgit.h" 9#include "cgit.h"
10#include "html.h" 10#include "html.h"
11#include "ui-shared.h" 11#include "ui-shared.h"
12#include "ui-ssdiff.h" 12#include "ui-ssdiff.h"
13 13
14unsigned char old_rev_sha1[20]; 14unsigned char old_rev_sha1[20];
15unsigned char new_rev_sha1[20]; 15unsigned char new_rev_sha1[20];
16 16
17static int files, slots; 17static int files, slots;
18static int total_adds, total_rems, max_changes; 18static int total_adds, total_rems, max_changes;
19static int lines_added, lines_removed; 19static int lines_added, lines_removed;
20 20
21static struct fileinfo { 21static struct fileinfo {
22 char status; 22 char status;
23 unsigned char old_sha1[20]; 23 unsigned char old_sha1[20];
24 unsigned char new_sha1[20]; 24 unsigned char new_sha1[20];
25 unsigned short old_mode; 25 unsigned short old_mode;
26 unsigned short new_mode; 26 unsigned short new_mode;
27 char *old_path; 27 char *old_path;
28 char *new_path; 28 char *new_path;
29 unsigned int added; 29 unsigned int added;
30 unsigned int removed; 30 unsigned int removed;
31 unsigned long old_size; 31 unsigned long old_size;
32 unsigned long new_size; 32 unsigned long new_size;
33 int binary:1; 33 int binary:1;
34} *items; 34} *items;
35 35
36static int use_ssdiff = 0; 36static int use_ssdiff = 0;
37 37
38static void print_fileinfo(struct fileinfo *info) 38static void print_fileinfo(struct fileinfo *info)
39{ 39{
40 char *class; 40 char *class;
41 41
42 switch (info->status) { 42 switch (info->status) {
43 case DIFF_STATUS_ADDED: 43 case DIFF_STATUS_ADDED:
44 class = "add"; 44 class = "add";
45 break; 45 break;
46 case DIFF_STATUS_COPIED: 46 case DIFF_STATUS_COPIED:
47 class = "cpy"; 47 class = "cpy";
48 break; 48 break;
49 case DIFF_STATUS_DELETED: 49 case DIFF_STATUS_DELETED:
50 class = "del"; 50 class = "del";
51 break; 51 break;
52 case DIFF_STATUS_MODIFIED: 52 case DIFF_STATUS_MODIFIED:
53 class = "upd"; 53 class = "upd";
54 break; 54 break;
55 case DIFF_STATUS_RENAMED: 55 case DIFF_STATUS_RENAMED:
56 class = "mov"; 56 class = "mov";
57 break; 57 break;
58 case DIFF_STATUS_TYPE_CHANGED: 58 case DIFF_STATUS_TYPE_CHANGED:
59 class = "typ"; 59 class = "typ";
60 break; 60 break;
61 case DIFF_STATUS_UNKNOWN: 61 case DIFF_STATUS_UNKNOWN:
62 class = "unk"; 62 class = "unk";
63 break; 63 break;
64 case DIFF_STATUS_UNMERGED: 64 case DIFF_STATUS_UNMERGED:
65 class = "stg"; 65 class = "stg";
66 break; 66 break;
67 default: 67 default:
68 die("bug: unhandled diff status %c", info->status); 68 die("bug: unhandled diff status %c", info->status);
69 } 69 }
70 70
71 html("<tr>"); 71 html("<tr>");
72 htmlf("<td class='mode'>"); 72 htmlf("<td class='mode'>");
73 if (is_null_sha1(info->new_sha1)) { 73 if (is_null_sha1(info->new_sha1)) {
74 cgit_print_filemode(info->old_mode); 74 cgit_print_filemode(info->old_mode);
75 } else { 75 } else {
76 cgit_print_filemode(info->new_mode); 76 cgit_print_filemode(info->new_mode);
77 } 77 }
78 78
79 if (info->old_mode != info->new_mode && 79 if (info->old_mode != info->new_mode &&
80 !is_null_sha1(info->old_sha1) && 80 !is_null_sha1(info->old_sha1) &&
81 !is_null_sha1(info->new_sha1)) { 81 !is_null_sha1(info->new_sha1)) {
82 html("<span class='modechange'>["); 82 html("<span class='modechange'>[");
83 cgit_print_filemode(info->old_mode); 83 cgit_print_filemode(info->old_mode);
84 html("]</span>"); 84 html("]</span>");
85 } 85 }
86 htmlf("</td><td class='%s'>", class); 86 htmlf("</td><td class='%s'>", class);
87 cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.sha1, 87 cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.sha1,
88 ctx.qry.sha2, info->new_path, 0); 88 ctx.qry.sha2, info->new_path, 0);
89 if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED) 89 if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED)
90 htmlf(" (%s from %s)", 90 htmlf(" (%s from %s)",
91 info->status == DIFF_STATUS_COPIED ? "copied" : "renamed", 91 info->status == DIFF_STATUS_COPIED ? "copied" : "renamed",
92 info->old_path); 92 info->old_path);
93 html("</td><td class='right'>"); 93 html("</td><td class='right'>");
94 if (info->binary) { 94 if (info->binary) {
95 htmlf("bin</td><td class='graph'>%d -> %d bytes", 95 htmlf("bin</td><td class='graph'>%d -> %d bytes",
96 info->old_size, info->new_size); 96 info->old_size, info->new_size);
97 return; 97 return;
98 } 98 }
99 htmlf("%d", info->added + info->removed); 99 htmlf("%d", info->added + info->removed);
100 html("</td><td class='graph'>"); 100 html("</td><td class='graph'>");
101 htmlf("<table summary='file diffstat' width='%d%%'><tr>", (max_changes > 100 ? 100 : max_changes)); 101 htmlf("<table summary='file diffstat' width='%d%%'><tr>", (max_changes > 100 ? 100 : max_changes));
102 htmlf("<td class='add' style='width: %.1f%%;'/>", 102 htmlf("<td class='add' style='width: %.1f%%;'/>",
103 info->added * 100.0 / max_changes); 103 info->added * 100.0 / max_changes);
104 htmlf("<td class='rem' style='width: %.1f%%;'/>", 104 htmlf("<td class='rem' style='width: %.1f%%;'/>",
105 info->removed * 100.0 / max_changes); 105 info->removed * 100.0 / max_changes);
106 htmlf("<td class='none' style='width: %.1f%%;'/>", 106 htmlf("<td class='none' style='width: %.1f%%;'/>",
107 (max_changes - info->removed - info->added) * 100.0 / max_changes); 107 (max_changes - info->removed - info->added) * 100.0 / max_changes);
108 html("</tr></table></td></tr>\n"); 108 html("</tr></table></td></tr>\n");
109} 109}
110 110
111static void count_diff_lines(char *line, int len) 111static void count_diff_lines(char *line, int len)
112{ 112{
113 if (line && (len > 0)) { 113 if (line && (len > 0)) {
114 if (line[0] == '+') 114 if (line[0] == '+')
115 lines_added++; 115 lines_added++;
116 else if (line[0] == '-') 116 else if (line[0] == '-')
117 lines_removed++; 117 lines_removed++;
118 } 118 }
119} 119}
120 120
121static void inspect_filepair(struct diff_filepair *pair) 121static void inspect_filepair(struct diff_filepair *pair)
122{ 122{
123 int binary = 0; 123 int binary = 0;
124 unsigned long old_size = 0; 124 unsigned long old_size = 0;
125 unsigned long new_size = 0; 125 unsigned long new_size = 0;
126 files++; 126 files++;
127 lines_added = 0; 127 lines_added = 0;
128 lines_removed = 0; 128 lines_removed = 0;
129 cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, &new_size, 129 cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, &new_size,
130 &binary, 0, ctx.qry.ignorews, count_diff_lines); 130 &binary, 0, ctx.qry.ignorews, count_diff_lines);
131 if (files >= slots) { 131 if (files >= slots) {
132 if (slots == 0) 132 if (slots == 0)
133 slots = 4; 133 slots = 4;
134 else 134 else
135 slots = slots * 2; 135 slots = slots * 2;
136 items = xrealloc(items, slots * sizeof(struct fileinfo)); 136 items = xrealloc(items, slots * sizeof(struct fileinfo));
137 } 137 }
138 items[files-1].status = pair->status; 138 items[files-1].status = pair->status;
139 hashcpy(items[files-1].old_sha1, pair->one->sha1); 139 hashcpy(items[files-1].old_sha1, pair->one->sha1);
140 hashcpy(items[files-1].new_sha1, pair->two->sha1); 140 hashcpy(items[files-1].new_sha1, pair->two->sha1);
141 items[files-1].old_mode = pair->one->mode; 141 items[files-1].old_mode = pair->one->mode;
142 items[files-1].new_mode = pair->two->mode; 142 items[files-1].new_mode = pair->two->mode;
143 items[files-1].old_path = xstrdup(pair->one->path); 143 items[files-1].old_path = xstrdup(pair->one->path);
144 items[files-1].new_path = xstrdup(pair->two->path); 144 items[files-1].new_path = xstrdup(pair->two->path);
145 items[files-1].added = lines_added; 145 items[files-1].added = lines_added;
146 items[files-1].removed = lines_removed; 146 items[files-1].removed = lines_removed;
147 items[files-1].old_size = old_size; 147 items[files-1].old_size = old_size;
148 items[files-1].new_size = new_size; 148 items[files-1].new_size = new_size;
149 items[files-1].binary = binary; 149 items[files-1].binary = binary;
150 if (lines_added + lines_removed > max_changes) 150 if (lines_added + lines_removed > max_changes)
151 max_changes = lines_added + lines_removed; 151 max_changes = lines_added + lines_removed;
152 total_adds += lines_added; 152 total_adds += lines_added;
153 total_rems += lines_removed; 153 total_rems += lines_removed;
154} 154}
155 155
156void cgit_print_diffstat(const unsigned char *old_sha1, 156void cgit_print_diffstat(const unsigned char *old_sha1,
157 const unsigned char *new_sha1, const char *prefix) 157 const unsigned char *new_sha1, const char *prefix)
158{ 158{
159 int i, save_context = ctx.qry.context; 159 int i, save_context = ctx.qry.context;
160 160
161 html("<div class='diffstat-header'>"); 161 html("<div class='diffstat-header'>");
162 cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.sha1, 162 cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.sha1,
163 ctx.qry.sha2, NULL, 0); 163 ctx.qry.sha2, NULL, 0);
164 if (prefix) 164 if (prefix)
165 htmlf(" (limited to '%s')", prefix); 165 htmlf(" (limited to '%s')", prefix);
166 html(" ("); 166 html(" (");
167 ctx.qry.context = (save_context > 0 ? save_context : 3) << 1; 167 ctx.qry.context = (save_context > 0 ? save_context : 3) << 1;
168 cgit_self_link("more", NULL, NULL, &ctx); 168 cgit_self_link("more", NULL, NULL, &ctx);
169 html("/"); 169 html("/");
170 ctx.qry.context = (save_context > 3 ? save_context : 3) >> 1; 170 ctx.qry.context = (save_context > 3 ? save_context : 3) >> 1;
171 cgit_self_link("less", NULL, NULL, &ctx); 171 cgit_self_link("less", NULL, NULL, &ctx);
172 ctx.qry.context = save_context; 172 ctx.qry.context = save_context;
173 html(" context)"); 173 html(" context)");
174 html(" (");
175 ctx.qry.ignorews = (ctx.qry.ignorews + 1) % 2;
176 cgit_self_link(ctx.qry.ignorews ? "ignore" : "show", NULL, NULL, &ctx);
177 ctx.qry.ignorews = (ctx.qry.ignorews + 1) % 2;
178 html(" whitespace changes)");
174 html("</div>"); 179 html("</div>");
175 html("<table summary='diffstat' class='diffstat'>"); 180 html("<table summary='diffstat' class='diffstat'>");
176 max_changes = 0; 181 max_changes = 0;
177 cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, prefix, 182 cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, prefix,
178 ctx.qry.ignorews); 183 ctx.qry.ignorews);
179 for(i = 0; i<files; i++) 184 for(i = 0; i<files; i++)
180 print_fileinfo(&items[i]); 185 print_fileinfo(&items[i]);
181 html("</table>"); 186 html("</table>");
182 html("<div class='diffstat-summary'>"); 187 html("<div class='diffstat-summary'>");
183 htmlf("%d files changed, %d insertions, %d deletions", 188 htmlf("%d files changed, %d insertions, %d deletions",
184 files, total_adds, total_rems); 189 files, total_adds, total_rems);
185 html("</div>"); 190 html("</div>");
186} 191}
187 192
188 193
189/* 194/*
190 * print a single line returned from xdiff 195 * print a single line returned from xdiff
191 */ 196 */
192static void print_line(char *line, int len) 197static void print_line(char *line, int len)
193{ 198{
194 char *class = "ctx"; 199 char *class = "ctx";
195 char c = line[len-1]; 200 char c = line[len-1];
196 201
197 if (line[0] == '+') 202 if (line[0] == '+')
198 class = "add"; 203 class = "add";
199 else if (line[0] == '-') 204 else if (line[0] == '-')
200 class = "del"; 205 class = "del";
201 else if (line[0] == '@') 206 else if (line[0] == '@')
202 class = "hunk"; 207 class = "hunk";
203 208
204 htmlf("<div class='%s'>", class); 209 htmlf("<div class='%s'>", class);
205 line[len-1] = '\0'; 210 line[len-1] = '\0';
206 html_txt(line); 211 html_txt(line);
207 html("</div>"); 212 html("</div>");
208 line[len-1] = c; 213 line[len-1] = c;
209} 214}
210 215
211static void header(unsigned char *sha1, char *path1, int mode1, 216static void header(unsigned char *sha1, char *path1, int mode1,
212 unsigned char *sha2, char *path2, int mode2) 217 unsigned char *sha2, char *path2, int mode2)
213{ 218{
214 char *abbrev1, *abbrev2; 219 char *abbrev1, *abbrev2;
215 int subproject; 220 int subproject;
216 221
217 subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2)); 222 subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2));
218 html("<div class='head'>"); 223 html("<div class='head'>");
219 html("diff --git a/"); 224 html("diff --git a/");
220 html_txt(path1); 225 html_txt(path1);
221 html(" b/"); 226 html(" b/");
222 html_txt(path2); 227 html_txt(path2);
223 228
224 if (is_null_sha1(sha1)) 229 if (is_null_sha1(sha1))
225 path1 = "dev/null"; 230 path1 = "dev/null";
226 if (is_null_sha1(sha2)) 231 if (is_null_sha1(sha2))
227 path2 = "dev/null"; 232 path2 = "dev/null";
228 233
229 if (mode1 == 0) 234 if (mode1 == 0)
230 htmlf("<br/>new file mode %.6o", mode2); 235 htmlf("<br/>new file mode %.6o", mode2);
231 236
232 if (mode2 == 0) 237 if (mode2 == 0)
233 htmlf("<br/>deleted file mode %.6o", mode1); 238 htmlf("<br/>deleted file mode %.6o", mode1);
234 239
235 if (!subproject) { 240 if (!subproject) {
236 abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV)); 241 abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV));
237 abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV)); 242 abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV));
238 htmlf("<br/>index %s..%s", abbrev1, abbrev2); 243 htmlf("<br/>index %s..%s", abbrev1, abbrev2);
239 free(abbrev1); 244 free(abbrev1);
240 free(abbrev2); 245 free(abbrev2);
241 if (mode1 != 0 && mode2 != 0) { 246 if (mode1 != 0 && mode2 != 0) {
242 htmlf(" %.6o", mode1); 247 htmlf(" %.6o", mode1);
243 if (mode2 != mode1) 248 if (mode2 != mode1)
244 htmlf("..%.6o", mode2); 249 htmlf("..%.6o", mode2);
245 } 250 }
246 html("<br/>--- a/"); 251 html("<br/>--- a/");
247 if (mode1 != 0) 252 if (mode1 != 0)
248 cgit_tree_link(path1, NULL, NULL, ctx.qry.head, 253 cgit_tree_link(path1, NULL, NULL, ctx.qry.head,
249 sha1_to_hex(old_rev_sha1), path1); 254 sha1_to_hex(old_rev_sha1), path1);
250 else 255 else
251 html_txt(path1); 256 html_txt(path1);
252 html("<br/>+++ b/"); 257 html("<br/>+++ b/");
253 if (mode2 != 0) 258 if (mode2 != 0)
254 cgit_tree_link(path2, NULL, NULL, ctx.qry.head, 259 cgit_tree_link(path2, NULL, NULL, ctx.qry.head,
255 sha1_to_hex(new_rev_sha1), path2); 260 sha1_to_hex(new_rev_sha1), path2);
256 else 261 else
257 html_txt(path2); 262 html_txt(path2);
258 } 263 }
259 html("</div>"); 264 html("</div>");
260} 265}
261 266
262static void print_ssdiff_link() 267static void print_ssdiff_link()
263{ 268{
264 if (!strcmp(ctx.qry.page, "diff")) { 269 if (!strcmp(ctx.qry.page, "diff")) {
265 if (use_ssdiff) 270 if (use_ssdiff)
266 cgit_diff_link("Unidiff", NULL, NULL, ctx.qry.head, 271 cgit_diff_link("Unidiff", NULL, NULL, ctx.qry.head,
267 ctx.qry.sha1, ctx.qry.sha2, ctx.qry.path, 1); 272 ctx.qry.sha1, ctx.qry.sha2, ctx.qry.path, 1);
268 else 273 else
269 cgit_diff_link("Side-by-side diff", NULL, NULL, 274 cgit_diff_link("Side-by-side diff", NULL, NULL,
270 ctx.qry.head, ctx.qry.sha1, 275 ctx.qry.head, ctx.qry.sha1,
271 ctx.qry.sha2, ctx.qry.path, 1); 276 ctx.qry.sha2, ctx.qry.path, 1);
272 } 277 }
273} 278}
274 279
275static void filepair_cb(struct diff_filepair *pair) 280static void filepair_cb(struct diff_filepair *pair)
276{ 281{
277 unsigned long old_size = 0; 282 unsigned long old_size = 0;
278 unsigned long new_size = 0; 283 unsigned long new_size = 0;
279 int binary = 0; 284 int binary = 0;
280 linediff_fn print_line_fn = print_line; 285 linediff_fn print_line_fn = print_line;
281 286
282 if (use_ssdiff) { 287 if (use_ssdiff) {
283 cgit_ssdiff_header_begin(); 288 cgit_ssdiff_header_begin();
284 print_line_fn = cgit_ssdiff_line_cb; 289 print_line_fn = cgit_ssdiff_line_cb;
285 } 290 }
286 header(pair->one->sha1, pair->one->path, pair->one->mode, 291 header(pair->one->sha1, pair->one->path, pair->one->mode,
287 pair->two->sha1, pair->two->path, pair->two->mode); 292 pair->two->sha1, pair->two->path, pair->two->mode);
288 if (use_ssdiff) 293 if (use_ssdiff)
289 cgit_ssdiff_header_end(); 294 cgit_ssdiff_header_end();
290 if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) { 295 if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) {
291 if (S_ISGITLINK(pair->one->mode)) 296 if (S_ISGITLINK(pair->one->mode))
292 print_line_fn(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52); 297 print_line_fn(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52);
293 if (S_ISGITLINK(pair->two->mode)) 298 if (S_ISGITLINK(pair->two->mode))
294 print_line_fn(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); 299 print_line_fn(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52);
295 if (use_ssdiff) 300 if (use_ssdiff)
296 cgit_ssdiff_footer(); 301 cgit_ssdiff_footer();
297 return; 302 return;
298 } 303 }
299 if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, 304 if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,
300 &new_size, &binary, ctx.qry.context, 305 &new_size, &binary, ctx.qry.context,
301 ctx.qry.ignorews, print_line_fn)) 306 ctx.qry.ignorews, print_line_fn))
302 cgit_print_error("Error running diff"); 307 cgit_print_error("Error running diff");
303 if (binary) { 308 if (binary) {
304 if (use_ssdiff) 309 if (use_ssdiff)
305 html("<tr><td colspan='4'>Binary files differ</td></tr>"); 310 html("<tr><td colspan='4'>Binary files differ</td></tr>");
306 else 311 else
307 html("Binary files differ"); 312 html("Binary files differ");
308 } 313 }
309 if (use_ssdiff) 314 if (use_ssdiff)
310 cgit_ssdiff_footer(); 315 cgit_ssdiff_footer();
311} 316}
312 317
313void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefix) 318void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefix)
314{ 319{
315 enum object_type type; 320 enum object_type type;
316 unsigned long size; 321 unsigned long size;
317 struct commit *commit, *commit2; 322 struct commit *commit, *commit2;
318 323
319 if (!new_rev) 324 if (!new_rev)
320 new_rev = ctx.qry.head; 325 new_rev = ctx.qry.head;
321 get_sha1(new_rev, new_rev_sha1); 326 get_sha1(new_rev, new_rev_sha1);
322 type = sha1_object_info(new_rev_sha1, &size); 327 type = sha1_object_info(new_rev_sha1, &size);
323 if (type == OBJ_BAD) { 328 if (type == OBJ_BAD) {
324 cgit_print_error(fmt("Bad object name: %s", new_rev)); 329 cgit_print_error(fmt("Bad object name: %s", new_rev));
325 return; 330 return;
326 } 331 }
327 commit = lookup_commit_reference(new_rev_sha1); 332 commit = lookup_commit_reference(new_rev_sha1);
328 if (!commit || parse_commit(commit)) 333 if (!commit || parse_commit(commit))
329 cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(new_rev_sha1))); 334 cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(new_rev_sha1)));
330 335
331 if (old_rev) 336 if (old_rev)
332 get_sha1(old_rev, old_rev_sha1); 337 get_sha1(old_rev, old_rev_sha1);
333 else if (commit->parents && commit->parents->item) 338 else if (commit->parents && commit->parents->item)
334 hashcpy(old_rev_sha1, commit->parents->item->object.sha1); 339 hashcpy(old_rev_sha1, commit->parents->item->object.sha1);
335 else 340 else
336 hashclr(old_rev_sha1); 341 hashclr(old_rev_sha1);
337 342
338 if (!is_null_sha1(old_rev_sha1)) { 343 if (!is_null_sha1(old_rev_sha1)) {
339 type = sha1_object_info(old_rev_sha1, &size); 344 type = sha1_object_info(old_rev_sha1, &size);
340 if (type == OBJ_BAD) { 345 if (type == OBJ_BAD) {
341 cgit_print_error(fmt("Bad object name: %s", sha1_to_hex(old_rev_sha1))); 346 cgit_print_error(fmt("Bad object name: %s", sha1_to_hex(old_rev_sha1)));
342 return; 347 return;
343 } 348 }
344 commit2 = lookup_commit_reference(old_rev_sha1); 349 commit2 = lookup_commit_reference(old_rev_sha1);
345 if (!commit2 || parse_commit(commit2)) 350 if (!commit2 || parse_commit(commit2))
346 cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(old_rev_sha1))); 351 cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(old_rev_sha1)));
347 } 352 }
348 353
349 if ((ctx.qry.ssdiff && !ctx.cfg.ssdiff) || (!ctx.qry.ssdiff && ctx.cfg.ssdiff)) 354 if ((ctx.qry.ssdiff && !ctx.cfg.ssdiff) || (!ctx.qry.ssdiff && ctx.cfg.ssdiff))
350 use_ssdiff = 1; 355 use_ssdiff = 1;
351 356
352 print_ssdiff_link(); 357 print_ssdiff_link();
353 cgit_print_diffstat(old_rev_sha1, new_rev_sha1, prefix); 358 cgit_print_diffstat(old_rev_sha1, new_rev_sha1, prefix);
354 359
355 if (use_ssdiff) { 360 if (use_ssdiff) {
356 html("<table summary='ssdiff' class='ssdiff'>"); 361 html("<table summary='ssdiff' class='ssdiff'>");
357 } else { 362 } else {
358 html("<table summary='diff' class='diff'>"); 363 html("<table summary='diff' class='diff'>");
359 html("<tr><td>"); 364 html("<tr><td>");
360 } 365 }
361 cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix, 366 cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix,
362 ctx.qry.ignorews); 367 ctx.qry.ignorews);
363 if (!use_ssdiff) 368 if (!use_ssdiff)
364 html("</td></tr>"); 369 html("</td></tr>");
365 html("</table>"); 370 html("</table>");
366} 371}
diff --git a/ui-shared.c b/ui-shared.c
index c99bcec..f46c935 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -96,560 +96,570 @@ char *cgit_pageurl(const char *reponame, const char *pagename,
96 return cgit_fileurl(reponame,pagename,0,query); 96 return cgit_fileurl(reponame,pagename,0,query);
97} 97}
98 98
99const char *cgit_repobasename(const char *reponame) 99const char *cgit_repobasename(const char *reponame)
100{ 100{
101 /* I assume we don't need to store more than one repo basename */ 101 /* I assume we don't need to store more than one repo basename */
102 static char rvbuf[1024]; 102 static char rvbuf[1024];
103 int p; 103 int p;
104 const char *rv; 104 const char *rv;
105 strncpy(rvbuf,reponame,sizeof(rvbuf)); 105 strncpy(rvbuf,reponame,sizeof(rvbuf));
106 if(rvbuf[sizeof(rvbuf)-1]) 106 if(rvbuf[sizeof(rvbuf)-1])
107 die("cgit_repobasename: truncated repository name '%s'", reponame); 107 die("cgit_repobasename: truncated repository name '%s'", reponame);
108 p = strlen(rvbuf)-1; 108 p = strlen(rvbuf)-1;
109 /* strip trailing slashes */ 109 /* strip trailing slashes */
110 while(p && rvbuf[p]=='/') rvbuf[p--]=0; 110 while(p && rvbuf[p]=='/') rvbuf[p--]=0;
111 /* strip trailing .git */ 111 /* strip trailing .git */
112 if(p>=3 && !strncmp(&rvbuf[p-3],".git",4)) { 112 if(p>=3 && !strncmp(&rvbuf[p-3],".git",4)) {
113 p -= 3; rvbuf[p--] = 0; 113 p -= 3; rvbuf[p--] = 0;
114 } 114 }
115 /* strip more trailing slashes if any */ 115 /* strip more trailing slashes if any */
116 while( p && rvbuf[p]=='/') rvbuf[p--]=0; 116 while( p && rvbuf[p]=='/') rvbuf[p--]=0;
117 /* find last slash in the remaining string */ 117 /* find last slash in the remaining string */
118 rv = strrchr(rvbuf,'/'); 118 rv = strrchr(rvbuf,'/');
119 if(rv) 119 if(rv)
120 return ++rv; 120 return ++rv;
121 return rvbuf; 121 return rvbuf;
122} 122}
123 123
124char *cgit_currurl() 124char *cgit_currurl()
125{ 125{
126 if (!ctx.cfg.virtual_root) 126 if (!ctx.cfg.virtual_root)
127 return ctx.cfg.script_name; 127 return ctx.cfg.script_name;
128 else if (ctx.qry.page) 128 else if (ctx.qry.page)
129 return fmt("%s/%s/%s/", ctx.cfg.virtual_root, ctx.qry.repo, ctx.qry.page); 129 return fmt("%s/%s/%s/", ctx.cfg.virtual_root, ctx.qry.repo, ctx.qry.page);
130 else if (ctx.qry.repo) 130 else if (ctx.qry.repo)
131 return fmt("%s/%s/", ctx.cfg.virtual_root, ctx.qry.repo); 131 return fmt("%s/%s/", ctx.cfg.virtual_root, ctx.qry.repo);
132 else 132 else
133 return fmt("%s/", ctx.cfg.virtual_root); 133 return fmt("%s/", ctx.cfg.virtual_root);
134} 134}
135 135
136static void site_url(const char *page, const char *search, int ofs) 136static void site_url(const char *page, const char *search, int ofs)
137{ 137{
138 char *delim = "?"; 138 char *delim = "?";
139 139
140 if (ctx.cfg.virtual_root) { 140 if (ctx.cfg.virtual_root) {
141 html_attr(ctx.cfg.virtual_root); 141 html_attr(ctx.cfg.virtual_root);
142 if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/') 142 if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/')
143 html("/"); 143 html("/");
144 } else 144 } else
145 html(ctx.cfg.script_name); 145 html(ctx.cfg.script_name);
146 146
147 if (page) { 147 if (page) {
148 htmlf("?p=%s", page); 148 htmlf("?p=%s", page);
149 delim = "&"; 149 delim = "&";
150 } 150 }
151 if (search) { 151 if (search) {
152 html(delim); 152 html(delim);
153 html("q="); 153 html("q=");
154 html_attr(search); 154 html_attr(search);
155 delim = "&"; 155 delim = "&";
156 } 156 }
157 if (ofs) { 157 if (ofs) {
158 html(delim); 158 html(delim);
159 htmlf("ofs=%d", ofs); 159 htmlf("ofs=%d", ofs);
160 } 160 }
161} 161}
162 162
163static void site_link(const char *page, const char *name, const char *title, 163static void site_link(const char *page, const char *name, const char *title,
164 const char *class, const char *search, int ofs) 164 const char *class, const char *search, int ofs)
165{ 165{
166 html("<a"); 166 html("<a");
167 if (title) { 167 if (title) {
168 html(" title='"); 168 html(" title='");
169 html_attr(title); 169 html_attr(title);
170 html("'"); 170 html("'");
171 } 171 }
172 if (class) { 172 if (class) {
173 html(" class='"); 173 html(" class='");
174 html_attr(class); 174 html_attr(class);
175 html("'"); 175 html("'");
176 } 176 }
177 html(" href='"); 177 html(" href='");
178 site_url(page, search, ofs); 178 site_url(page, search, ofs);
179 html("'>"); 179 html("'>");
180 html_txt(name); 180 html_txt(name);
181 html("</a>"); 181 html("</a>");
182} 182}
183 183
184void cgit_index_link(const char *name, const char *title, const char *class, 184void cgit_index_link(const char *name, const char *title, const char *class,
185 const char *pattern, int ofs) 185 const char *pattern, int ofs)
186{ 186{
187 site_link(NULL, name, title, class, pattern, ofs); 187 site_link(NULL, name, title, class, pattern, ofs);
188} 188}
189 189
190static char *repolink(const char *title, const char *class, const char *page, 190static char *repolink(const char *title, const char *class, const char *page,
191 const char *head, const char *path) 191 const char *head, const char *path)
192{ 192{
193 char *delim = "?"; 193 char *delim = "?";
194 194
195 html("<a"); 195 html("<a");
196 if (title) { 196 if (title) {
197 html(" title='"); 197 html(" title='");
198 html_attr(title); 198 html_attr(title);
199 html("'"); 199 html("'");
200 } 200 }
201 if (class) { 201 if (class) {
202 html(" class='"); 202 html(" class='");
203 html_attr(class); 203 html_attr(class);
204 html("'"); 204 html("'");
205 } 205 }
206 html(" href='"); 206 html(" href='");
207 if (ctx.cfg.virtual_root) { 207 if (ctx.cfg.virtual_root) {
208 html_url_path(ctx.cfg.virtual_root); 208 html_url_path(ctx.cfg.virtual_root);
209 if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/') 209 if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/')
210 html("/"); 210 html("/");
211 html_url_path(ctx.repo->url); 211 html_url_path(ctx.repo->url);
212 if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/') 212 if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/')
213 html("/"); 213 html("/");
214 if (page) { 214 if (page) {
215 html_url_path(page); 215 html_url_path(page);
216 html("/"); 216 html("/");
217 if (path) 217 if (path)
218 html_url_path(path); 218 html_url_path(path);
219 } 219 }
220 } else { 220 } else {
221 html(ctx.cfg.script_name); 221 html(ctx.cfg.script_name);
222 html("?url="); 222 html("?url=");
223 html_url_arg(ctx.repo->url); 223 html_url_arg(ctx.repo->url);
224 if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/') 224 if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/')
225 html("/"); 225 html("/");
226 if (page) { 226 if (page) {
227 html_url_arg(page); 227 html_url_arg(page);
228 html("/"); 228 html("/");
229 if (path) 229 if (path)
230 html_url_arg(path); 230 html_url_arg(path);
231 } 231 }
232 delim = "&amp;"; 232 delim = "&amp;";
233 } 233 }
234 if (head && strcmp(head, ctx.repo->defbranch)) { 234 if (head && strcmp(head, ctx.repo->defbranch)) {
235 html(delim); 235 html(delim);
236 html("h="); 236 html("h=");
237 html_url_arg(head); 237 html_url_arg(head);
238 delim = "&amp;"; 238 delim = "&amp;";
239 } 239 }
240 return fmt("%s", delim); 240 return fmt("%s", delim);
241} 241}
242 242
243static void reporevlink(const char *page, const char *name, const char *title, 243static void reporevlink(const char *page, const char *name, const char *title,
244 const char *class, const char *head, const char *rev, 244 const char *class, const char *head, const char *rev,
245 const char *path) 245 const char *path)
246{ 246{
247 char *delim; 247 char *delim;
248 248
249 delim = repolink(title, class, page, head, path); 249 delim = repolink(title, class, page, head, path);
250 if (rev && ctx.qry.head != NULL && strcmp(rev, ctx.qry.head)) { 250 if (rev && ctx.qry.head != NULL && strcmp(rev, ctx.qry.head)) {
251 html(delim); 251 html(delim);
252 html("id="); 252 html("id=");
253 html_url_arg(rev); 253 html_url_arg(rev);
254 } 254 }
255 html("'>"); 255 html("'>");
256 html_txt(name); 256 html_txt(name);
257 html("</a>"); 257 html("</a>");
258} 258}
259 259
260void cgit_summary_link(const char *name, const char *title, const char *class, 260void cgit_summary_link(const char *name, const char *title, const char *class,
261 const char *head) 261 const char *head)
262{ 262{
263 reporevlink(NULL, name, title, class, head, NULL, NULL); 263 reporevlink(NULL, name, title, class, head, NULL, NULL);
264} 264}
265 265
266void cgit_tag_link(const char *name, const char *title, const char *class, 266void cgit_tag_link(const char *name, const char *title, const char *class,
267 const char *head, const char *rev) 267 const char *head, const char *rev)
268{ 268{
269 reporevlink("tag", name, title, class, head, rev, NULL); 269 reporevlink("tag", name, title, class, head, rev, NULL);
270} 270}
271 271
272void cgit_tree_link(const char *name, const char *title, const char *class, 272void cgit_tree_link(const char *name, const char *title, const char *class,
273 const char *head, const char *rev, const char *path) 273 const char *head, const char *rev, const char *path)
274{ 274{
275 reporevlink("tree", name, title, class, head, rev, path); 275 reporevlink("tree", name, title, class, head, rev, path);
276} 276}
277 277
278void cgit_plain_link(const char *name, const char *title, const char *class, 278void cgit_plain_link(const char *name, const char *title, const char *class,
279 const char *head, const char *rev, const char *path) 279 const char *head, const char *rev, const char *path)
280{ 280{
281 reporevlink("plain", name, title, class, head, rev, path); 281 reporevlink("plain", name, title, class, head, rev, path);
282} 282}
283 283
284void cgit_log_link(const char *name, const char *title, const char *class, 284void cgit_log_link(const char *name, const char *title, const char *class,
285 const char *head, const char *rev, const char *path, 285 const char *head, const char *rev, const char *path,
286 int ofs, const char *grep, const char *pattern, int showmsg) 286 int ofs, const char *grep, const char *pattern, int showmsg)
287{ 287{
288 char *delim; 288 char *delim;
289 289
290 delim = repolink(title, class, "log", head, path); 290 delim = repolink(title, class, "log", head, path);
291 if (rev && strcmp(rev, ctx.qry.head)) { 291 if (rev && strcmp(rev, ctx.qry.head)) {
292 html(delim); 292 html(delim);
293 html("id="); 293 html("id=");
294 html_url_arg(rev); 294 html_url_arg(rev);
295 delim = "&"; 295 delim = "&";
296 } 296 }
297 if (grep && pattern) { 297 if (grep && pattern) {
298 html(delim); 298 html(delim);
299 html("qt="); 299 html("qt=");
300 html_url_arg(grep); 300 html_url_arg(grep);
301 delim = "&"; 301 delim = "&";
302 html(delim); 302 html(delim);
303 html("q="); 303 html("q=");
304 html_url_arg(pattern); 304 html_url_arg(pattern);
305 } 305 }
306 if (ofs > 0) { 306 if (ofs > 0) {
307 html(delim); 307 html(delim);
308 html("ofs="); 308 html("ofs=");
309 htmlf("%d", ofs); 309 htmlf("%d", ofs);
310 delim = "&"; 310 delim = "&";
311 } 311 }
312 if (showmsg) { 312 if (showmsg) {
313 html(delim); 313 html(delim);
314 html("showmsg=1"); 314 html("showmsg=1");
315 } 315 }
316 html("'>"); 316 html("'>");
317 html_txt(name); 317 html_txt(name);
318 html("</a>"); 318 html("</a>");
319} 319}
320 320
321void cgit_commit_link(char *name, const char *title, const char *class, 321void cgit_commit_link(char *name, const char *title, const char *class,
322 const char *head, const char *rev, const char *path, 322 const char *head, const char *rev, const char *path,
323 int toggle_ssdiff) 323 int toggle_ssdiff)
324{ 324{
325 if (strlen(name) > ctx.cfg.max_msg_len && ctx.cfg.max_msg_len >= 15) { 325 if (strlen(name) > ctx.cfg.max_msg_len && ctx.cfg.max_msg_len >= 15) {
326 name[ctx.cfg.max_msg_len] = '\0'; 326 name[ctx.cfg.max_msg_len] = '\0';
327 name[ctx.cfg.max_msg_len - 1] = '.'; 327 name[ctx.cfg.max_msg_len - 1] = '.';
328 name[ctx.cfg.max_msg_len - 2] = '.'; 328 name[ctx.cfg.max_msg_len - 2] = '.';
329 name[ctx.cfg.max_msg_len - 3] = '.'; 329 name[ctx.cfg.max_msg_len - 3] = '.';
330 } 330 }
331 331
332 char *delim; 332 char *delim;
333 333
334 delim = repolink(title, class, "commit", head, path); 334 delim = repolink(title, class, "commit", head, path);
335 if (rev && strcmp(rev, ctx.qry.head)) { 335 if (rev && strcmp(rev, ctx.qry.head)) {
336 html(delim); 336 html(delim);
337 html("id="); 337 html("id=");
338 html_url_arg(rev); 338 html_url_arg(rev);
339 delim = "&amp;"; 339 delim = "&amp;";
340 } 340 }
341 if ((ctx.qry.ssdiff && !toggle_ssdiff) || (!ctx.qry.ssdiff && toggle_ssdiff)) { 341 if ((ctx.qry.ssdiff && !toggle_ssdiff) || (!ctx.qry.ssdiff && toggle_ssdiff)) {
342 html(delim); 342 html(delim);
343 html("ss=1"); 343 html("ss=1");
344 delim = "&amp;"; 344 delim = "&amp;";
345 } 345 }
346 if (ctx.qry.context > 0 && ctx.qry.context != 3) { 346 if (ctx.qry.context > 0 && ctx.qry.context != 3) {
347 html(delim); 347 html(delim);
348 html("context="); 348 html("context=");
349 htmlf("%d", ctx.qry.context); 349 htmlf("%d", ctx.qry.context);
350 delim = "&amp;"; 350 delim = "&amp;";
351 } 351 }
352 if (ctx.qry.ignorews) {
353 html(delim);
354 html("ignorews=1");
355 delim = "&amp;";
356 }
352 html("'>"); 357 html("'>");
353 html_txt(name); 358 html_txt(name);
354 html("</a>"); 359 html("</a>");
355} 360}
356 361
357void cgit_refs_link(const char *name, const char *title, const char *class, 362void cgit_refs_link(const char *name, const char *title, const char *class,
358 const char *head, const char *rev, const char *path) 363 const char *head, const char *rev, const char *path)
359{ 364{
360 reporevlink("refs", name, title, class, head, rev, path); 365 reporevlink("refs", name, title, class, head, rev, path);
361} 366}
362 367
363void cgit_snapshot_link(const char *name, const char *title, const char *class, 368void cgit_snapshot_link(const char *name, const char *title, const char *class,
364 const char *head, const char *rev, 369 const char *head, const char *rev,
365 const char *archivename) 370 const char *archivename)
366{ 371{
367 reporevlink("snapshot", name, title, class, head, rev, archivename); 372 reporevlink("snapshot", name, title, class, head, rev, archivename);
368} 373}
369 374
370void cgit_diff_link(const char *name, const char *title, const char *class, 375void cgit_diff_link(const char *name, const char *title, const char *class,
371 const char *head, const char *new_rev, const char *old_rev, 376 const char *head, const char *new_rev, const char *old_rev,
372 const char *path, int toggle_ssdiff) 377 const char *path, int toggle_ssdiff)
373{ 378{
374 char *delim; 379 char *delim;
375 380
376 delim = repolink(title, class, "diff", head, path); 381 delim = repolink(title, class, "diff", head, path);
377 if (new_rev && ctx.qry.head != NULL && strcmp(new_rev, ctx.qry.head)) { 382 if (new_rev && ctx.qry.head != NULL && strcmp(new_rev, ctx.qry.head)) {
378 html(delim); 383 html(delim);
379 html("id="); 384 html("id=");
380 html_url_arg(new_rev); 385 html_url_arg(new_rev);
381 delim = "&amp;"; 386 delim = "&amp;";
382 } 387 }
383 if (old_rev) { 388 if (old_rev) {
384 html(delim); 389 html(delim);
385 html("id2="); 390 html("id2=");
386 html_url_arg(old_rev); 391 html_url_arg(old_rev);
387 delim = "&amp;"; 392 delim = "&amp;";
388 } 393 }
389 if ((ctx.qry.ssdiff && !toggle_ssdiff) || (!ctx.qry.ssdiff && toggle_ssdiff)) { 394 if ((ctx.qry.ssdiff && !toggle_ssdiff) || (!ctx.qry.ssdiff && toggle_ssdiff)) {
390 html(delim); 395 html(delim);
391 html("ss=1"); 396 html("ss=1");
392 delim = "&amp;"; 397 delim = "&amp;";
393 } 398 }
394 if (ctx.qry.context > 0 && ctx.qry.context != 3) { 399 if (ctx.qry.context > 0 && ctx.qry.context != 3) {
395 html(delim); 400 html(delim);
396 html("context="); 401 html("context=");
397 htmlf("%d", ctx.qry.context); 402 htmlf("%d", ctx.qry.context);
398 delim = "&amp;"; 403 delim = "&amp;";
399 } 404 }
405 if (ctx.qry.ignorews) {
406 html(delim);
407 html("ignorews=1");
408 delim = "&amp;";
409 }
400 html("'>"); 410 html("'>");
401 html_txt(name); 411 html_txt(name);
402 html("</a>"); 412 html("</a>");
403} 413}
404 414
405void cgit_patch_link(const char *name, const char *title, const char *class, 415void cgit_patch_link(const char *name, const char *title, const char *class,
406 const char *head, const char *rev, const char *path) 416 const char *head, const char *rev, const char *path)
407{ 417{
408 reporevlink("patch", name, title, class, head, rev, path); 418 reporevlink("patch", name, title, class, head, rev, path);
409} 419}
410 420
411void cgit_stats_link(const char *name, const char *title, const char *class, 421void cgit_stats_link(const char *name, const char *title, const char *class,
412 const char *head, const char *path) 422 const char *head, const char *path)
413{ 423{
414 reporevlink("stats", name, title, class, head, NULL, path); 424 reporevlink("stats", name, title, class, head, NULL, path);
415} 425}
416 426
417void cgit_self_link(char *name, const char *title, const char *class, 427void cgit_self_link(char *name, const char *title, const char *class,
418 struct cgit_context *ctx) 428 struct cgit_context *ctx)
419{ 429{
420 if (!strcmp(ctx->qry.page, "repolist")) 430 if (!strcmp(ctx->qry.page, "repolist"))
421 return cgit_index_link(name, title, class, ctx->qry.search, 431 return cgit_index_link(name, title, class, ctx->qry.search,
422 ctx->qry.ofs); 432 ctx->qry.ofs);
423 else if (!strcmp(ctx->qry.page, "summary")) 433 else if (!strcmp(ctx->qry.page, "summary"))
424 return cgit_summary_link(name, title, class, ctx->qry.head); 434 return cgit_summary_link(name, title, class, ctx->qry.head);
425 else if (!strcmp(ctx->qry.page, "tag")) 435 else if (!strcmp(ctx->qry.page, "tag"))
426 return cgit_tag_link(name, title, class, ctx->qry.head, 436 return cgit_tag_link(name, title, class, ctx->qry.head,
427 ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL); 437 ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL);
428 else if (!strcmp(ctx->qry.page, "tree")) 438 else if (!strcmp(ctx->qry.page, "tree"))
429 return cgit_tree_link(name, title, class, ctx->qry.head, 439 return cgit_tree_link(name, title, class, ctx->qry.head,
430 ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL, 440 ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
431 ctx->qry.path); 441 ctx->qry.path);
432 else if (!strcmp(ctx->qry.page, "plain")) 442 else if (!strcmp(ctx->qry.page, "plain"))
433 return cgit_plain_link(name, title, class, ctx->qry.head, 443 return cgit_plain_link(name, title, class, ctx->qry.head,
434 ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL, 444 ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
435 ctx->qry.path); 445 ctx->qry.path);
436 else if (!strcmp(ctx->qry.page, "log")) 446 else if (!strcmp(ctx->qry.page, "log"))
437 return cgit_log_link(name, title, class, ctx->qry.head, 447 return cgit_log_link(name, title, class, ctx->qry.head,
438 ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL, 448 ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
439 ctx->qry.path, ctx->qry.ofs, 449 ctx->qry.path, ctx->qry.ofs,
440 ctx->qry.grep, ctx->qry.search, 450 ctx->qry.grep, ctx->qry.search,
441 ctx->qry.showmsg); 451 ctx->qry.showmsg);
442 else if (!strcmp(ctx->qry.page, "commit")) 452 else if (!strcmp(ctx->qry.page, "commit"))
443 return cgit_commit_link(name, title, class, ctx->qry.head, 453 return cgit_commit_link(name, title, class, ctx->qry.head,
444 ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL, 454 ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
445 ctx->qry.path, 0); 455 ctx->qry.path, 0);
446 else if (!strcmp(ctx->qry.page, "patch")) 456 else if (!strcmp(ctx->qry.page, "patch"))
447 return cgit_patch_link(name, title, class, ctx->qry.head, 457 return cgit_patch_link(name, title, class, ctx->qry.head,
448 ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL, 458 ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
449 ctx->qry.path); 459 ctx->qry.path);
450 else if (!strcmp(ctx->qry.page, "refs")) 460 else if (!strcmp(ctx->qry.page, "refs"))
451 return cgit_refs_link(name, title, class, ctx->qry.head, 461 return cgit_refs_link(name, title, class, ctx->qry.head,
452 ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL, 462 ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
453 ctx->qry.path); 463 ctx->qry.path);
454 else if (!strcmp(ctx->qry.page, "snapshot")) 464 else if (!strcmp(ctx->qry.page, "snapshot"))
455 return cgit_snapshot_link(name, title, class, ctx->qry.head, 465 return cgit_snapshot_link(name, title, class, ctx->qry.head,
456 ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL, 466 ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
457 ctx->qry.path); 467 ctx->qry.path);
458 else if (!strcmp(ctx->qry.page, "diff")) 468 else if (!strcmp(ctx->qry.page, "diff"))
459 return cgit_diff_link(name, title, class, ctx->qry.head, 469 return cgit_diff_link(name, title, class, ctx->qry.head,
460 ctx->qry.sha1, ctx->qry.sha2, 470 ctx->qry.sha1, ctx->qry.sha2,
461 ctx->qry.path, 0); 471 ctx->qry.path, 0);
462 else if (!strcmp(ctx->qry.page, "stats")) 472 else if (!strcmp(ctx->qry.page, "stats"))
463 return cgit_stats_link(name, title, class, ctx->qry.head, 473 return cgit_stats_link(name, title, class, ctx->qry.head,
464 ctx->qry.path); 474 ctx->qry.path);
465 475
466 /* Don't known how to make link for this page */ 476 /* Don't known how to make link for this page */
467 repolink(title, class, ctx->qry.page, ctx->qry.head, ctx->qry.path); 477 repolink(title, class, ctx->qry.page, ctx->qry.head, ctx->qry.path);
468 html("><!-- cgit_self_link() doesn't know how to make link for page '"); 478 html("><!-- cgit_self_link() doesn't know how to make link for page '");
469 html_txt(ctx->qry.page); 479 html_txt(ctx->qry.page);
470 html("' -->"); 480 html("' -->");
471 html_txt(name); 481 html_txt(name);
472 html("</a>"); 482 html("</a>");
473} 483}
474 484
475void cgit_object_link(struct object *obj) 485void cgit_object_link(struct object *obj)
476{ 486{
477 char *page, *shortrev, *fullrev, *name; 487 char *page, *shortrev, *fullrev, *name;
478 488
479 fullrev = sha1_to_hex(obj->sha1); 489 fullrev = sha1_to_hex(obj->sha1);
480 shortrev = xstrdup(fullrev); 490 shortrev = xstrdup(fullrev);
481 shortrev[10] = '\0'; 491 shortrev[10] = '\0';
482 if (obj->type == OBJ_COMMIT) { 492 if (obj->type == OBJ_COMMIT) {
483 cgit_commit_link(fmt("commit %s...", shortrev), NULL, NULL, 493 cgit_commit_link(fmt("commit %s...", shortrev), NULL, NULL,
484 ctx.qry.head, fullrev, NULL, 0); 494 ctx.qry.head, fullrev, NULL, 0);
485 return; 495 return;
486 } else if (obj->type == OBJ_TREE) 496 } else if (obj->type == OBJ_TREE)
487 page = "tree"; 497 page = "tree";
488 else if (obj->type == OBJ_TAG) 498 else if (obj->type == OBJ_TAG)
489 page = "tag"; 499 page = "tag";
490 else 500 else
491 page = "blob"; 501 page = "blob";
492 name = fmt("%s %s...", typename(obj->type), shortrev); 502 name = fmt("%s %s...", typename(obj->type), shortrev);
493 reporevlink(page, name, NULL, NULL, ctx.qry.head, fullrev, NULL); 503 reporevlink(page, name, NULL, NULL, ctx.qry.head, fullrev, NULL);
494} 504}
495 505
496void cgit_print_date(time_t secs, const char *format, int local_time) 506void cgit_print_date(time_t secs, const char *format, int local_time)
497{ 507{
498 char buf[64]; 508 char buf[64];
499 struct tm *time; 509 struct tm *time;
500 510
501 if (!secs) 511 if (!secs)
502 return; 512 return;
503 if(local_time) 513 if(local_time)
504 time = localtime(&secs); 514 time = localtime(&secs);
505 else 515 else
506 time = gmtime(&secs); 516 time = gmtime(&secs);
507 strftime(buf, sizeof(buf)-1, format, time); 517 strftime(buf, sizeof(buf)-1, format, time);
508 html_txt(buf); 518 html_txt(buf);
509} 519}
510 520
511void cgit_print_age(time_t t, time_t max_relative, const char *format) 521void cgit_print_age(time_t t, time_t max_relative, const char *format)
512{ 522{
513 time_t now, secs; 523 time_t now, secs;
514 524
515 if (!t) 525 if (!t)
516 return; 526 return;
517 time(&now); 527 time(&now);
518 secs = now - t; 528 secs = now - t;
519 529
520 if (secs > max_relative && max_relative >= 0) { 530 if (secs > max_relative && max_relative >= 0) {
521 cgit_print_date(t, format, ctx.cfg.local_time); 531 cgit_print_date(t, format, ctx.cfg.local_time);
522 return; 532 return;
523 } 533 }
524 534
525 if (secs < TM_HOUR * 2) { 535 if (secs < TM_HOUR * 2) {
526 htmlf("<span class='age-mins'>%.0f min.</span>", 536 htmlf("<span class='age-mins'>%.0f min.</span>",
527 secs * 1.0 / TM_MIN); 537 secs * 1.0 / TM_MIN);
528 return; 538 return;
529 } 539 }
530 if (secs < TM_DAY * 2) { 540 if (secs < TM_DAY * 2) {
531 htmlf("<span class='age-hours'>%.0f hours</span>", 541 htmlf("<span class='age-hours'>%.0f hours</span>",
532 secs * 1.0 / TM_HOUR); 542 secs * 1.0 / TM_HOUR);
533 return; 543 return;
534 } 544 }
535 if (secs < TM_WEEK * 2) { 545 if (secs < TM_WEEK * 2) {
536 htmlf("<span class='age-days'>%.0f days</span>", 546 htmlf("<span class='age-days'>%.0f days</span>",
537 secs * 1.0 / TM_DAY); 547 secs * 1.0 / TM_DAY);
538 return; 548 return;
539 } 549 }
540 if (secs < TM_MONTH * 2) { 550 if (secs < TM_MONTH * 2) {
541 htmlf("<span class='age-weeks'>%.0f weeks</span>", 551 htmlf("<span class='age-weeks'>%.0f weeks</span>",
542 secs * 1.0 / TM_WEEK); 552 secs * 1.0 / TM_WEEK);
543 return; 553 return;
544 } 554 }
545 if (secs < TM_YEAR * 2) { 555 if (secs < TM_YEAR * 2) {
546 htmlf("<span class='age-months'>%.0f months</span>", 556 htmlf("<span class='age-months'>%.0f months</span>",
547 secs * 1.0 / TM_MONTH); 557 secs * 1.0 / TM_MONTH);
548 return; 558 return;
549 } 559 }
550 htmlf("<span class='age-years'>%.0f years</span>", 560 htmlf("<span class='age-years'>%.0f years</span>",
551 secs * 1.0 / TM_YEAR); 561 secs * 1.0 / TM_YEAR);
552} 562}
553 563
554void cgit_print_http_headers(struct cgit_context *ctx) 564void cgit_print_http_headers(struct cgit_context *ctx)
555{ 565{
556 if (ctx->env.no_http && !strcmp(ctx->env.no_http, "1")) 566 if (ctx->env.no_http && !strcmp(ctx->env.no_http, "1"))
557 return; 567 return;
558 568
559 if (ctx->page.status) 569 if (ctx->page.status)
560 htmlf("Status: %d %s\n", ctx->page.status, ctx->page.statusmsg); 570 htmlf("Status: %d %s\n", ctx->page.status, ctx->page.statusmsg);
561 if (ctx->page.mimetype && ctx->page.charset) 571 if (ctx->page.mimetype && ctx->page.charset)
562 htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype, 572 htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype,
563 ctx->page.charset); 573 ctx->page.charset);
564 else if (ctx->page.mimetype) 574 else if (ctx->page.mimetype)
565 htmlf("Content-Type: %s\n", ctx->page.mimetype); 575 htmlf("Content-Type: %s\n", ctx->page.mimetype);
566 if (ctx->page.size) 576 if (ctx->page.size)
567 htmlf("Content-Length: %ld\n", ctx->page.size); 577 htmlf("Content-Length: %ld\n", ctx->page.size);
568 if (ctx->page.filename) 578 if (ctx->page.filename)
569 htmlf("Content-Disposition: inline; filename=\"%s\"\n", 579 htmlf("Content-Disposition: inline; filename=\"%s\"\n",
570 ctx->page.filename); 580 ctx->page.filename);
571 htmlf("Last-Modified: %s\n", http_date(ctx->page.modified)); 581 htmlf("Last-Modified: %s\n", http_date(ctx->page.modified));
572 htmlf("Expires: %s\n", http_date(ctx->page.expires)); 582 htmlf("Expires: %s\n", http_date(ctx->page.expires));
573 if (ctx->page.etag) 583 if (ctx->page.etag)
574 htmlf("ETag: \"%s\"\n", ctx->page.etag); 584 htmlf("ETag: \"%s\"\n", ctx->page.etag);
575 html("\n"); 585 html("\n");
576 if (ctx->env.request_method && !strcmp(ctx->env.request_method, "HEAD")) 586 if (ctx->env.request_method && !strcmp(ctx->env.request_method, "HEAD"))
577 exit(0); 587 exit(0);
578} 588}
579 589
580void cgit_print_docstart(struct cgit_context *ctx) 590void cgit_print_docstart(struct cgit_context *ctx)
581{ 591{
582 if (ctx->cfg.embedded) { 592 if (ctx->cfg.embedded) {
583 if (ctx->cfg.header) 593 if (ctx->cfg.header)
584 html_include(ctx->cfg.header); 594 html_include(ctx->cfg.header);
585 return; 595 return;
586 } 596 }
587 597
588 char *host = cgit_hosturl(); 598 char *host = cgit_hosturl();
589 html(cgit_doctype); 599 html(cgit_doctype);
590 html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); 600 html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n");
591 html("<head>\n"); 601 html("<head>\n");
592 html("<title>"); 602 html("<title>");
593 html_txt(ctx->page.title); 603 html_txt(ctx->page.title);
594 html("</title>\n"); 604 html("</title>\n");
595 htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); 605 htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version);
596 if (ctx->cfg.robots && *ctx->cfg.robots) 606 if (ctx->cfg.robots && *ctx->cfg.robots)
597 htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots); 607 htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots);
598 html("<link rel='stylesheet' type='text/css' href='"); 608 html("<link rel='stylesheet' type='text/css' href='");
599 html_attr(ctx->cfg.css); 609 html_attr(ctx->cfg.css);
600 html("'/>\n"); 610 html("'/>\n");
601 if (ctx->cfg.favicon) { 611 if (ctx->cfg.favicon) {
602 html("<link rel='shortcut icon' href='"); 612 html("<link rel='shortcut icon' href='");
603 html_attr(ctx->cfg.favicon); 613 html_attr(ctx->cfg.favicon);
604 html("'/>\n"); 614 html("'/>\n");
605 } 615 }
606 if (host && ctx->repo) { 616 if (host && ctx->repo) {
607 html("<link rel='alternate' title='Atom feed' href='"); 617 html("<link rel='alternate' title='Atom feed' href='");
608 html(cgit_httpscheme()); 618 html(cgit_httpscheme());
609 html_attr(cgit_hosturl()); 619 html_attr(cgit_hosturl());
610 html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.vpath, 620 html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.vpath,
611 fmt("h=%s", ctx->qry.head))); 621 fmt("h=%s", ctx->qry.head)));
612 html("' type='application/atom+xml'/>\n"); 622 html("' type='application/atom+xml'/>\n");
613 } 623 }
614 if (ctx->cfg.head_include) 624 if (ctx->cfg.head_include)
615 html_include(ctx->cfg.head_include); 625 html_include(ctx->cfg.head_include);
616 html("</head>\n"); 626 html("</head>\n");
617 html("<body>\n"); 627 html("<body>\n");
618 if (ctx->cfg.header) 628 if (ctx->cfg.header)
619 html_include(ctx->cfg.header); 629 html_include(ctx->cfg.header);
620} 630}
621 631
622void cgit_print_docend() 632void cgit_print_docend()
623{ 633{
624 html("</div> <!-- class=content -->\n"); 634 html("</div> <!-- class=content -->\n");
625 if (ctx.cfg.embedded) { 635 if (ctx.cfg.embedded) {
626 html("</div> <!-- id=cgit -->\n"); 636 html("</div> <!-- id=cgit -->\n");
627 if (ctx.cfg.footer) 637 if (ctx.cfg.footer)
628 html_include(ctx.cfg.footer); 638 html_include(ctx.cfg.footer);
629 return; 639 return;
630 } 640 }
631 if (ctx.cfg.footer) 641 if (ctx.cfg.footer)
632 html_include(ctx.cfg.footer); 642 html_include(ctx.cfg.footer);
633 else { 643 else {
634 htmlf("<div class='footer'>generated by cgit %s at ", 644 htmlf("<div class='footer'>generated by cgit %s at ",
635 cgit_version); 645 cgit_version);
636 cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time); 646 cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time);
637 html("</div>\n"); 647 html("</div>\n");
638 } 648 }
639 html("</div> <!-- id=cgit -->\n"); 649 html("</div> <!-- id=cgit -->\n");
640 html("</body>\n</html>\n"); 650 html("</body>\n</html>\n");
641} 651}
642 652
643int print_branch_option(const char *refname, const unsigned char *sha1, 653int print_branch_option(const char *refname, const unsigned char *sha1,
644 int flags, void *cb_data) 654 int flags, void *cb_data)
645{ 655{
646 char *name = (char *)refname; 656 char *name = (char *)refname;
647 html_option(name, name, ctx.qry.head); 657 html_option(name, name, ctx.qry.head);
648 return 0; 658 return 0;
649} 659}
650 660
651int print_archive_ref(const char *refname, const unsigned char *sha1, 661int print_archive_ref(const char *refname, const unsigned char *sha1,
652 int flags, void *cb_data) 662 int flags, void *cb_data)
653{ 663{
654 struct tag *tag; 664 struct tag *tag;
655 struct taginfo *info; 665 struct taginfo *info;