Merge branch 'jh/path-limit'

Lars Hjemli committed 16 years ago

Commit 37a24e42 parents 47187b3 a2cbd3c17 files · +275 −164Browse files

Unified · Split

17 files

cgit.c +6 −0
cgit.css +8 −2
cgit.h +1 −0
cgitrc.5.txt +1 −1
cmd.c +23 −23
cmd.h +2 −1
shared.c +0 −1
ui-commit.c +12 −8
ui-commit.h +1 −1
ui-diff.c +5 −3
ui-log.c +15 −12
ui-patch.c +4 −2
ui-patch.h +1 −1
ui-refs.c +1 −1
ui-shared.c +150 −66
ui-shared.h +43 −29
ui-tree.c +2 −13

@@ -433,6 +433,12 @@ static void process_request(void *cbdata) · 432 unmodified lines
433	433	return;
434	434	}
435	435
	436	+ /* If cmd->want_vpath is set, assume ctx->qry.path contains a "virtual"
	437	+ * in-project path limit to be made available at ctx->qry.vpath.
	438	+ * Otherwise, no path limit is in effect (ctx->qry.vpath = NULL).
	439	+ */
	440	+ ctx->qry.vpath = cmd->want_vpath ? ctx->qry.path : NULL;
	441	+
436	442	if (cmd->want_repo && !ctx->repo) {
437	443	cgit_print_http_headers(ctx);
438	444	cgit_print_docstart(ctx);

cgit.css+8−2

@@ -64,7 +64,7 @@ table#header td.sub { · 63 unmodified lines
64	64	}
65	65
66	66	table.tabs {
67		− /* border-bottom: solid 2px #ccc; */
	67	+ border-bottom: solid 3px #ccc;
68	68	border-collapse: collapse;
69	69	margin-top: 2em;
70	70	margin-bottom: 0px;
@@ -102,10 +102,16 @@ table.tabs td.form select { · 31 unmodified lines
102	102	font-size: 90%;
103	103	}
104	104
	105	+div.path {
	106	+ margin: 0px;
	107	+ padding: 5px 2em 2px 2em;
	108	+ color: #000;
	109	+ background-color: #eee;
	110	+}
	111	+
105	112	div.content {
106	113	margin: 0px;
107	114	padding: 2em;
108		− border-top: solid 3px #ccc;
109	115	border-bottom: solid 3px #ccc;
110	116	}
111	117

cgit.h+1−0

@@ -147,6 +147,7 @@ struct cgit_query { · 146 unmodified lines
147	147	int showmsg;
148	148	int ssdiff;
149	149	int show_all;
	150	+ char *vpath;
150	151	};
151	152
152	153	struct cgit_config {

cgitrc.5.txt+1−1

@@ -444,7 +444,7 @@ snapshots=tar.gz tar.bz2 zip · 443 unmodified lines
444	444	## List of common mimetypes
445	445	##
446	446
447		−mimetype.git=image/git
	447	+mimetype.gif=image/gif
448	448	mimetype.html=text/html
449	449	mimetype.jpg=image/jpeg
450	450	mimetype.jpeg=image/jpeg

cmd.c+23−23

@@ -51,7 +51,7 @@ static void blob_fn(struct cgit_context *ctx) · 50 unmodified lines
51	51
52	52	static void commit_fn(struct cgit_context *ctx)
53	53	{
54		− cgit_print_commit(ctx->qry.sha1);
	54	+ cgit_print_commit(ctx->qry.sha1, ctx->qry.path);
55	55	}
56	56
57	57	static void diff_fn(struct cgit_context *ctx)
@@ -90,7 +90,7 @@ static void repolist_fn(struct cgit_context *ctx) · 32 unmodified lines
90	90
91	91	static void patch_fn(struct cgit_context *ctx)
92	92	{
93		− cgit_print_patch(ctx->qry.sha1);
	93	+ cgit_print_patch(ctx->qry.sha1, ctx->qry.path);
94	94	}
95	95
96	96	static void plain_fn(struct cgit_context *ctx)
@@ -129,31 +129,31 @@ static void tree_fn(struct cgit_context *ctx) · 32 unmodified lines
129	129	cgit_print_tree(ctx->qry.sha1, ctx->qry.path);
130	130	}
131	131
132		−#define def_cmd(name, want_repo, want_layout) \
133		− {#name, name##_fn, want_repo, want_layout}
	132	+#define def_cmd(name, want_repo, want_layout, want_vpath) \
	133	+ {#name, name##_fn, want_repo, want_layout, want_vpath}
134	134
135	135	struct cgit_cmd cgit_get_cmd(struct cgit_context ctx)
136	136	{
137	137	static struct cgit_cmd cmds[] = {
138		− def_cmd(HEAD, 1, 0),
139		− def_cmd(atom, 1, 0),
140		− def_cmd(about, 0, 1),
141		− def_cmd(blob, 1, 0),
142		− def_cmd(commit, 1, 1),
143		− def_cmd(diff, 1, 1),
144		− def_cmd(info, 1, 0),
145		− def_cmd(log, 1, 1),
146		− def_cmd(ls_cache, 0, 0),
147		− def_cmd(objects, 1, 0),
148		− def_cmd(patch, 1, 0),
149		− def_cmd(plain, 1, 0),
150		− def_cmd(refs, 1, 1),
151		− def_cmd(repolist, 0, 0),
152		− def_cmd(snapshot, 1, 0),
153		− def_cmd(stats, 1, 1),
154		− def_cmd(summary, 1, 1),
155		− def_cmd(tag, 1, 1),
156		− def_cmd(tree, 1, 1),
	138	+ def_cmd(HEAD, 1, 0, 0),
	139	+ def_cmd(atom, 1, 0, 0),
	140	+ def_cmd(about, 0, 1, 0),
	141	+ def_cmd(blob, 1, 0, 0),
	142	+ def_cmd(commit, 1, 1, 1),
	143	+ def_cmd(diff, 1, 1, 1),
	144	+ def_cmd(info, 1, 0, 0),
	145	+ def_cmd(log, 1, 1, 1),
	146	+ def_cmd(ls_cache, 0, 0, 0),
	147	+ def_cmd(objects, 1, 0, 0),
	148	+ def_cmd(patch, 1, 0, 1),
	149	+ def_cmd(plain, 1, 0, 0),
	150	+ def_cmd(refs, 1, 1, 0),
	151	+ def_cmd(repolist, 0, 0, 0),
	152	+ def_cmd(snapshot, 1, 0, 0),
	153	+ def_cmd(stats, 1, 1, 1),
	154	+ def_cmd(summary, 1, 1, 0),
	155	+ def_cmd(tag, 1, 1, 0),
	156	+ def_cmd(tree, 1, 1, 1),
157	157	};
158	158	int i;
159	159

cmd.h+2−1

@@ -7,7 +7,8 @@ struct cgit_cmd { · 6 unmodified lines
7	7	const char *name;
8	8	cgit_cmd_fn fn;
9	9	unsigned int want_repo:1,
10		− want_layout:1;
	10	+ want_layout:1,
	11	+ want_vpath:1;
11	12	};
12	13
13	14	extern struct cgit_cmd cgit_get_cmd(struct cgit_context ctx);

shared.c+0−1

@@ -10,7 +10,6 @@ · 9 unmodified lines
10	10
11	11	struct cgit_repolist cgit_repolist;
12	12	struct cgit_context ctx;
13		−int cgit_cmd;
14	13
15	14	int chk_zero(int result, char *msg)
16	15	{

ui-commit.c+12−8

@@ -12,7 +12,7 @@ · 11 unmodified lines
12	12	#include "ui-diff.h"
13	13	#include "ui-log.h"
14	14
15		−void cgit_print_commit(char *hex)
	15	+void cgit_print_commit(char hex, const char prefix)
16	16	{
17	17	struct commit commit, parent;
18	18	struct commitinfo info, parent_info;
@@ -58,19 +58,23 @@ void cgit_print_commit(char *hex) · 39 unmodified lines
58	58	html("</td></tr>\n");
59	59	html("<tr><th>commit</th><td colspan='2' class='sha1'>");
60	60	tmp = sha1_to_hex(commit->object.sha1);
61		− cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp, 0);
	61	+ cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp, prefix, 0);
62	62	html(" (");
63		− cgit_patch_link("patch", NULL, NULL, NULL, tmp);
	63	+ cgit_patch_link("patch", NULL, NULL, NULL, tmp, prefix);
64	64	html(") (");
65	65	if ((ctx.qry.ssdiff && !ctx.cfg.ssdiff) \|\| (!ctx.qry.ssdiff && ctx.cfg.ssdiff))
66		− cgit_commit_link("unidiff", NULL, NULL, ctx.qry.head, tmp, 1);
	66	+ cgit_commit_link("unidiff", NULL, NULL, ctx.qry.head, tmp, prefix, 1);
67	67	else
68		− cgit_commit_link("side-by-side diff", NULL, NULL, ctx.qry.head, tmp, 1);
	68	+ cgit_commit_link("side-by-side diff", NULL, NULL, ctx.qry.head, tmp, prefix, 1);
69	69	html(")</td></tr>\n");
70	70	html("<tr><th>tree</th><td colspan='2' class='sha1'>");
71	71	tmp = xstrdup(hex);
72	72	cgit_tree_link(sha1_to_hex(commit->tree->object.sha1), NULL, NULL,
73	73	ctx.qry.head, tmp, NULL);
	74	+ if (prefix) {
	75	+ html(" /");
	76	+ cgit_tree_link(prefix, NULL, NULL, ctx.qry.head, tmp, prefix);
	77	+ }
74	78	html("</td></tr>\n");
75	79	for (p = commit->parents; p ; p = p->next) {
76	80	parent = lookup_commit_reference(p->item->object.sha1);
@@ -87,10 +91,10 @@ void cgit_print_commit(char *hex) · 10 unmodified lines
87	91	parent_info = cgit_parse_commit(parent);
88	92	tmp2 = parent_info->subject;
89	93	}
90		− cgit_commit_link(tmp2, NULL, NULL, ctx.qry.head, tmp, 0);
	94	+ cgit_commit_link(tmp2, NULL, NULL, ctx.qry.head, tmp, prefix, 0);
91	95	html(" (");
92	96	cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex,
93		− sha1_to_hex(p->item->object.sha1), NULL, 0);
	97	+ sha1_to_hex(p->item->object.sha1), prefix, 0);
94	98	html(")</td></tr>");
95	99	parents++;
96	100	}
@@ -121,7 +125,7 @@ void cgit_print_commit(char *hex) · 24 unmodified lines
121	125	tmp = sha1_to_hex(commit->parents->item->object.sha1);
122	126	else
123	127	tmp = NULL;
124		− cgit_print_diff(ctx.qry.sha1, tmp, NULL);
	128	+ cgit_print_diff(ctx.qry.sha1, tmp, prefix);
125	129	}
126	130	cgit_free_commitinfo(info);
127	131	}

ui-commit.h+1−1

@@ -1,6 +1,6 @@
1	1	#ifndef UI_COMMIT_H
2	2	#define UI_COMMIT_H
3	3
4		−extern void cgit_print_commit(char *hex);
	4	+extern void cgit_print_commit(char hex, const char prefix);
5	5
6	6	#endif /* UI_COMMIT_H */

ui-diff.c+5−3

@@ -154,17 +154,19 @@ static void inspect_filepair(struct diff_filepair *pair) · 153 unmodified lines
154	154	}
155	155
156	156	void cgit_print_diffstat(const unsigned char *old_sha1,
157		− const unsigned char *new_sha1)
	157	+ const unsigned char new_sha1, const char prefix)
158	158	{
159	159	int i;
160	160
161	161	html("<div class='diffstat-header'>");
162	162	cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.sha1,
163	163	ctx.qry.sha2, NULL, 0);
	164	+ if (prefix)
	165	+ htmlf(" (limited to '%s')", prefix);
164	166	html("</div>");
165	167	html("<table summary='diffstat' class='diffstat'>");
166	168	max_changes = 0;
167		− cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, NULL);
	169	+ cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, prefix);
168	170	for(i = 0; i<files; i++)
169	171	print_fileinfo(&items[i]);
170	172	html("</table>");
@@ -338,7 +340,7 @@ void cgit_print_diff(const char new_rev, const char old_rev, const char *prefi · 167 unmodified lines
338	340	use_ssdiff = 1;
339	341
340	342	print_ssdiff_link();
341		− cgit_print_diffstat(old_rev_sha1, new_rev_sha1);
	343	+ cgit_print_diffstat(old_rev_sha1, new_rev_sha1, prefix);
342	344
343	345	if (use_ssdiff) {
344	346	html("<table summary='ssdiff' class='ssdiff'>");

ui-log.c+15−12

@@ -46,8 +46,9 @@ void show_commit_decorations(struct commit *commit) · 45 unmodified lines
46	46	while (deco) {
47	47	if (!prefixcmp(deco->name, "refs/heads/")) {
48	48	strncpy(buf, deco->name + 11, sizeof(buf) - 1);
49		− cgit_log_link(buf, NULL, "branch-deco", buf, NULL, NULL,
50		− 0, NULL, NULL, ctx.qry.showmsg);
	49	+ cgit_log_link(buf, NULL, "branch-deco", buf, NULL,
	50	+ ctx.qry.vpath, 0, NULL, NULL,
	51	+ ctx.qry.showmsg);
51	52	}
52	53	else if (!prefixcmp(deco->name, "tag: refs/tags/")) {
53	54	strncpy(buf, deco->name + 15, sizeof(buf) - 1);
@@ -60,13 +61,15 @@ void show_commit_decorations(struct commit *commit) · 6 unmodified lines
60	61	else if (!prefixcmp(deco->name, "refs/remotes/")) {
61	62	strncpy(buf, deco->name + 13, sizeof(buf) - 1);
62	63	cgit_log_link(buf, NULL, "remote-deco", NULL,
63		− sha1_to_hex(commit->object.sha1), NULL,
64		− 0, NULL, NULL, ctx.qry.showmsg);
	64	+ sha1_to_hex(commit->object.sha1),
	65	+ ctx.qry.vpath, 0, NULL, NULL,
	66	+ ctx.qry.showmsg);
65	67	}
66	68	else {
67	69	strncpy(buf, deco->name, sizeof(buf) - 1);
68	70	cgit_commit_link(buf, NULL, "deco", ctx.qry.head,
69		− sha1_to_hex(commit->object.sha1), 0);
	71	+ sha1_to_hex(commit->object.sha1),
	72	+ ctx.qry.vpath, 0);
70	73	}
71	74	deco = deco->next;
72	75	}
@@ -82,14 +85,14 @@ void print_commit(struct commit *commit) · 9 unmodified lines
82	85	htmlf("<tr%s><td>",
83	86	ctx.qry.showmsg ? " class='logheader'" : "");
84	87	tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1));
85		− tmp = cgit_pageurl(ctx.repo->url, "commit", tmp);
	88	+ tmp = cgit_fileurl(ctx.repo->url, "commit", ctx.qry.vpath, tmp);
86	89	html_link_open(tmp, NULL, NULL);
87	90	cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
88	91	html_link_close();
89	92	htmlf("</td><td%s>",
90	93	ctx.qry.showmsg ? " class='logsubject'" : "");
91	94	cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head,
92		− sha1_to_hex(commit->object.sha1), 0);
	95	+ sha1_to_hex(commit->object.sha1), ctx.qry.vpath, 0);
93	96	show_commit_decorations(commit);
94	97	html("</td><td>");
95	98	html_txt(info->author);
@@ -176,7 +179,7 @@ void cgit_print_log(const char tip, int ofs, int cnt, char grep, char *pattern · 80 unmodified lines
176	179	html(" (");
177	180	cgit_log_link(ctx.qry.showmsg ? "Collapse" : "Expand", NULL,
178	181	NULL, ctx.qry.head, ctx.qry.sha1,
179		− ctx.qry.path, ctx.qry.ofs, ctx.qry.grep,
	182	+ ctx.qry.vpath, ctx.qry.ofs, ctx.qry.grep,
180	183	ctx.qry.search, ctx.qry.showmsg ? 0 : 1);
181	184	html(")");
182	185	}
@@ -213,22 +216,22 @@ void cgit_print_log(const char tip, int ofs, int cnt, char grep, char *pattern · 30 unmodified lines
213	216	columns);
214	217	if (ofs > 0) {
215	218	cgit_log_link("[prev]", NULL, NULL, ctx.qry.head,
216		− ctx.qry.sha1, ctx.qry.path,
	219	+ ctx.qry.sha1, ctx.qry.vpath,
217	220	ofs - cnt, ctx.qry.grep,
218	221	ctx.qry.search, ctx.qry.showmsg);
219	222	html(" ");
220	223	}
221	224	if ((commit = get_revision(&rev)) != NULL) {
222	225	cgit_log_link("[next]", NULL, NULL, ctx.qry.head,
223		− ctx.qry.sha1, ctx.qry.path,
	226	+ ctx.qry.sha1, ctx.qry.vpath,
224	227	ofs + cnt, ctx.qry.grep,
225	228	ctx.qry.search, ctx.qry.showmsg);
226	229	}
227	230	html("</div>");
228	231	} else if ((commit = get_revision(&rev)) != NULL) {
229	232	html("<tr class='nohover'><td colspan='3'>");
230		− cgit_log_link("[...]", NULL, NULL, ctx.qry.head, NULL, NULL, 0,
231		− NULL, NULL, ctx.qry.showmsg);
	233	+ cgit_log_link("[...]", NULL, NULL, ctx.qry.head, NULL,
	234	+ ctx.qry.vpath, 0, NULL, NULL, ctx.qry.showmsg);
232	235	html("</td></tr>\n");
233	236	}
234	237	}

ui-patch.c+4−2

@@ -77,7 +77,7 @@ static void filepair_cb(struct diff_filepair *pair) · 76 unmodified lines
77	77	html("Binary files differ\n");
78	78	}
79	79
80		−void cgit_print_patch(char *hex)
	80	+void cgit_print_patch(char hex, const char prefix)
81	81	{
82	82	struct commit *commit;
83	83	struct commitinfo *info;
@@ -122,7 +122,9 @@ void cgit_print_patch(char *hex) · 38 unmodified lines
122	122	html("\n");
123	123	}
124	124	html("---\n");
125		− cgit_diff_tree(old_sha1, sha1, filepair_cb, NULL);
	125	+ if (prefix)
	126	+ htmlf("(limited to '%s')\n\n", prefix);
	127	+ cgit_diff_tree(old_sha1, sha1, filepair_cb, prefix);
126	128	html("--\n");
127	129	htmlf("cgit %s\n", CGIT_VERSION);
128	130	cgit_free_commitinfo(info);

ui-patch.h+1−1

@@ -1,6 +1,6 @@
1	1	#ifndef UI_PATCH_H
2	2	#define UI_PATCH_H
3	3
4		−extern void cgit_print_patch(char *hex);
	4	+extern void cgit_print_patch(char hex, const char prefix);
5	5
6	6	#endif /* UI_PATCH_H */

ui-refs.c+1−1

@@ -74,7 +74,7 @@ static int print_branch(struct refinfo *ref) · 73 unmodified lines
74	74	html("</td><td>");
75	75
76	76	if (ref->object->type == OBJ_COMMIT) {
77		− cgit_commit_link(info->subject, NULL, NULL, name, NULL, 0);
	77	+ cgit_commit_link(info->subject, NULL, NULL, name, NULL, NULL, 0);
78	78	html("</td><td>");
79	79	html_txt(info->author);
80	80	html("</td><td colspan='2'>");

ui-shared.c+150−66

@@ -27,7 +27,7 @@ static char *http_date(time_t t) · 26 unmodified lines
27	27	tm->tm_hour, tm->tm_min, tm->tm_sec);
28	28	}
29	29
30		−void cgit_print_error(char *msg)
	30	+void cgit_print_error(const char *msg)
31	31	{
32	32	html("<div class='error'>");
33	33	html_txt(msg);
@@ -133,7 +133,7 @@ char *cgit_currurl() · 99 unmodified lines
133	133	return fmt("%s/", ctx.cfg.virtual_root);
134	134	}
135	135
136		−static void site_url(char page, char search, int ofs)
	136	+static void site_url(const char page, const char search, int ofs)
137	137	{
138	138	char *delim = "?";
139	139
@@ -160,8 +160,8 @@ static void site_url(char page, char search, int ofs) · 20 unmodified lines
160	160	}
161	161	}
162	162
163		−static void site_link(char page, char name, char title, char class,
164		− char *search, int ofs)
	163	+static void site_link(const char page, const char name, const char *title,
	164	+ const char class, const char search, int ofs)
165	165	{
166	166	html("<a");
167	167	if (title) {
@@ -181,14 +181,14 @@ static void site_link(char page, char name, char title, char class, · 13 unmodified lines
181	181	html("</a>");
182	182	}
183	183
184		−void cgit_index_link(char name, char title, char class, char pattern,
185		− int ofs)
	184	+void cgit_index_link(const char name, const char title, const char *class,
	185	+ const char *pattern, int ofs)
186	186	{
187	187	site_link(NULL, name, title, class, pattern, ofs);
188	188	}
189	189
190		−static char repolink(char title, char class, char page, char *head,
191		− char *path)
	190	+static char repolink(const char title, const char class, const char page,
	191	+ const char head, const char path)
192	192	{
193	193	char *delim = "?";
194	194
@@ -240,8 +240,9 @@ static char repolink(char title, char class, char page, char *head, · 45 unmodified lines
240	240	return fmt("%s", delim);
241	241	}
242	242
243		−static void reporevlink(char page, char name, char title, char class,
244		− char head, char rev, char *path)
	243	+static void reporevlink(const char page, const char name, const char *title,
	244	+ const char class, const char head, const char *rev,
	245	+ const char *path)
245	246	{
246	247	char *delim;
247	248
@@ -256,32 +257,33 @@ static void reporevlink(char page, char name, char title, char class, · 8 unmodified lines
256	257	html("</a>");
257	258	}
258	259
259		−void cgit_summary_link(char name, char title, char class, char head)
	260	+void cgit_summary_link(const char name, const char title, const char *class,
	261	+ const char *head)
260	262	{
261	263	reporevlink(NULL, name, title, class, head, NULL, NULL);
262	264	}
263	265
264		−void cgit_tag_link(char name, char title, char class, char head,
265		− char *rev)
	266	+void cgit_tag_link(const char name, const char title, const char *class,
	267	+ const char head, const char rev)
266	268	{
267	269	reporevlink("tag", name, title, class, head, rev, NULL);
268	270	}
269	271
270		−void cgit_tree_link(char name, char title, char class, char head,
271		− char rev, char path)
	272	+void cgit_tree_link(const char name, const char title, const char *class,
	273	+ const char head, const char rev, const char *path)
272	274	{
273	275	reporevlink("tree", name, title, class, head, rev, path);
274	276	}
275	277
276		−void cgit_plain_link(char name, char title, char class, char head,
277		− char rev, char path)
	278	+void cgit_plain_link(const char name, const char title, const char *class,
	279	+ const char head, const char rev, const char *path)
278	280	{
279	281	reporevlink("plain", name, title, class, head, rev, path);
280	282	}
281	283
282		−void cgit_log_link(char name, char title, char class, char head,
283		− char rev, char path, int ofs, char grep, char pattern,
284		− int showmsg)
	284	+void cgit_log_link(const char name, const char title, const char *class,
	285	+ const char head, const char rev, const char *path,
	286	+ int ofs, const char grep, const char pattern, int showmsg)
285	287	{
286	288	char *delim;
287	289
@@ -316,8 +318,9 @@ void cgit_log_link(char name, char title, char class, char head, · 28 unmodified lines
316	318	html("</a>");
317	319	}
318	320
319		−void cgit_commit_link(char name, char title, char class, char head,
320		− char *rev, int toggle_ssdiff)
	321	+void cgit_commit_link(char name, const char title, const char *class,
	322	+ const char head, const char rev, const char *path,
	323	+ int toggle_ssdiff)
321	324	{
322	325	if (strlen(name) > ctx.cfg.max_msg_len && ctx.cfg.max_msg_len >= 15) {
323	326	name[ctx.cfg.max_msg_len] = '\0';
@@ -328,7 +331,7 @@ void cgit_commit_link(char name, char title, char class, char head, · 4 unmodified lines
328	331
329	332	char *delim;
330	333
331		− delim = repolink(title, class, "commit", head, NULL);
	334	+ delim = repolink(title, class, "commit", head, path);
332	335	if (rev && strcmp(rev, ctx.qry.head)) {
333	336	html(delim);
334	337	html("id=");
@@ -344,21 +347,22 @@ void cgit_commit_link(char name, char title, char class, char head, · 9 unmodified lines
344	347	html("</a>");
345	348	}
346	349
347		−void cgit_refs_link(char name, char title, char class, char head,
348		− char rev, char path)
	350	+void cgit_refs_link(const char name, const char title, const char *class,
	351	+ const char head, const char rev, const char *path)
349	352	{
350	353	reporevlink("refs", name, title, class, head, rev, path);
351	354	}
352	355
353		−void cgit_snapshot_link(char name, char title, char class, char head,
354		− char rev, char archivename)
	356	+void cgit_snapshot_link(const char name, const char title, const char *class,
	357	+ const char head, const char rev,
	358	+ const char *archivename)
355	359	{
356	360	reporevlink("snapshot", name, title, class, head, rev, archivename);
357	361	}
358	362
359		−void cgit_diff_link(char name, char title, char class, char head,
360		− char new_rev, char old_rev, char *path,
361		− int toggle_ssdiff)
	363	+void cgit_diff_link(const char name, const char title, const char *class,
	364	+ const char head, const char new_rev, const char *old_rev,
	365	+ const char *path, int toggle_ssdiff)
362	366	{
363	367	char *delim;
364	368
@@ -384,18 +388,76 @@ void cgit_diff_link(char name, char title, char class, char head, · 19 unmodified lines
384	388	html("</a>");
385	389	}
386	390
387		−void cgit_patch_link(char name, char title, char class, char head,
388		− char *rev)
	391	+void cgit_patch_link(const char name, const char title, const char *class,
	392	+ const char head, const char rev, const char *path)
389	393	{
390		− reporevlink("patch", name, title, class, head, rev, NULL);
	394	+ reporevlink("patch", name, title, class, head, rev, path);
391	395	}
392	396
393		−void cgit_stats_link(char name, char title, char class, char head,
394		− char *path)
	397	+void cgit_stats_link(const char name, const char title, const char *class,
	398	+ const char head, const char path)
395	399	{
396	400	reporevlink("stats", name, title, class, head, NULL, path);
397	401	}
398	402
	403	+void cgit_self_link(char name, const char title, const char *class,
	404	+ struct cgit_context *ctx)
	405	+{
	406	+ if (!strcmp(ctx->qry.page, "repolist"))
	407	+ return cgit_index_link(name, title, class, ctx->qry.search,
	408	+ ctx->qry.ofs);
	409	+ else if (!strcmp(ctx->qry.page, "summary"))
	410	+ return cgit_summary_link(name, title, class, ctx->qry.head);
	411	+ else if (!strcmp(ctx->qry.page, "tag"))
	412	+ return cgit_tag_link(name, title, class, ctx->qry.head,
	413	+ ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL);
	414	+ else if (!strcmp(ctx->qry.page, "tree"))
	415	+ return cgit_tree_link(name, title, class, ctx->qry.head,
	416	+ ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
	417	+ ctx->qry.path);
	418	+ else if (!strcmp(ctx->qry.page, "plain"))
	419	+ return cgit_plain_link(name, title, class, ctx->qry.head,
	420	+ ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
	421	+ ctx->qry.path);
	422	+ else if (!strcmp(ctx->qry.page, "log"))
	423	+ return cgit_log_link(name, title, class, ctx->qry.head,
	424	+ ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
	425	+ ctx->qry.path, ctx->qry.ofs,
	426	+ ctx->qry.grep, ctx->qry.search,
	427	+ ctx->qry.showmsg);
	428	+ else if (!strcmp(ctx->qry.page, "commit"))
	429	+ return cgit_commit_link(name, title, class, ctx->qry.head,
	430	+ ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
	431	+ ctx->qry.path, 0);
	432	+ else if (!strcmp(ctx->qry.page, "patch"))
	433	+ return cgit_patch_link(name, title, class, ctx->qry.head,
	434	+ ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
	435	+ ctx->qry.path);
	436	+ else if (!strcmp(ctx->qry.page, "refs"))
	437	+ return cgit_refs_link(name, title, class, ctx->qry.head,
	438	+ ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
	439	+ ctx->qry.path);
	440	+ else if (!strcmp(ctx->qry.page, "snapshot"))
	441	+ return cgit_snapshot_link(name, title, class, ctx->qry.head,
	442	+ ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
	443	+ ctx->qry.path);
	444	+ else if (!strcmp(ctx->qry.page, "diff"))
	445	+ return cgit_diff_link(name, title, class, ctx->qry.head,
	446	+ ctx->qry.sha1, ctx->qry.sha2,
	447	+ ctx->qry.path, 0);
	448	+ else if (!strcmp(ctx->qry.page, "stats"))
	449	+ return cgit_stats_link(name, title, class, ctx->qry.head,
	450	+ ctx->qry.path);
	451	+
	452	+ /* Don't known how to make link for this page */
	453	+ repolink(title, class, ctx->qry.page, ctx->qry.head, ctx->qry.path);
	454	+ html("><!-- cgit_self_link() doesn't know how to make link for page '");
	455	+ html_txt(ctx->qry.page);
	456	+ html("' -->");
	457	+ html_txt(name);
	458	+ html("</a>");
	459	+}
	460	+
399	461	void cgit_object_link(struct object *obj)
400	462	{
401	463	char page, shortrev, fullrev, name;
@@ -405,7 +467,7 @@ void cgit_object_link(struct object *obj) · 3 unmodified lines
405	467	shortrev[10] = '\0';
406	468	if (obj->type == OBJ_COMMIT) {
407	469	cgit_commit_link(fmt("commit %s...", shortrev), NULL, NULL,
408		− ctx.qry.head, fullrev, 0);
	470	+ ctx.qry.head, fullrev, NULL, 0);
409	471	return;
410	472	} else if (obj->type == OBJ_TREE)
411	473	page = "tree";
@@ -417,7 +479,7 @@ void cgit_object_link(struct object *obj) · 5 unmodified lines
417	479	reporevlink(page, name, NULL, NULL, ctx.qry.head, fullrev, NULL);
418	480	}
419	481
420		−void cgit_print_date(time_t secs, char *format, int local_time)
	482	+void cgit_print_date(time_t secs, const char *format, int local_time)
421	483	{
422	484	char buf[64];
423	485	struct tm *time;
@@ -432,7 +494,7 @@ void cgit_print_date(time_t secs, char *format, int local_time) · 8 unmodified lines
432	494	html_txt(buf);
433	495	}
434	496
435		−void cgit_print_age(time_t t, time_t max_relative, char *format)
	497	+void cgit_print_age(time_t t, time_t max_relative, const char *format)
436	498	{
437	499	time_t now, secs;
438	500
@@ -531,7 +593,7 @@ void cgit_print_docstart(struct cgit_context *ctx) · 92 unmodified lines
531	593	html("<link rel='alternate' title='Atom feed' href='");
532	594	html(cgit_httpscheme());
533	595	html_attr(cgit_hosturl());
534		− html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path,
	596	+ html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.vpath,
535	597	fmt("h=%s", ctx->qry.head)));
536	598	html("' type='application/atom+xml'/>\n");
537	599	}
@@ -611,14 +673,15 @@ int print_archive_ref(const char refname, const unsigned char sha1, · 73 unmodified lines
611	673	return 0;
612	674	}
613	675
614		−void cgit_add_hidden_formfields(int incl_head, int incl_search, char *page)
	676	+void cgit_add_hidden_formfields(int incl_head, int incl_search,
	677	+ const char *page)
615	678	{
616	679	char *url;
617	680
618	681	if (!ctx.cfg.virtual_root) {
619	682	url = fmt("%s/%s", ctx.qry.repo, page);
620		− if (ctx.qry.path)
621		− url = fmt("%s/%s", url, ctx.qry.path);
	683	+ if (ctx.qry.vpath)
	684	+ url = fmt("%s/%s", url, ctx.qry.vpath);
622	685	html_hidden("url", url);
623	686	}
624	687
@@ -641,11 +704,30 @@ void cgit_add_hidden_formfields(int incl_head, int incl_search, char *page) · 16 unmodified lines
641	704	}
642	705	}
643	706
644		−const char *fallback_cmd = "repolist";
	707	+static const char hc(struct cgit_context ctx, const char *page)
	708	+{
	709	+ return strcmp(ctx->qry.page, page) ? NULL : "active";
	710	+}
645	711
646		−char hc(struct cgit_cmd cmd, const char *page)
	712	+static void cgit_print_path_crumbs(struct cgit_context ctx, char path)
647	713	{
648		− return (strcmp(cmd ? cmd->name : fallback_cmd, page) ? NULL : "active");
	714	+ char *old_path = ctx->qry.path;
	715	+ char p = path, q, *end = path + strlen(path);
	716	+
	717	+ ctx->qry.path = NULL;
	718	+ cgit_self_link("root", NULL, NULL, ctx);
	719	+ ctx->qry.path = p = path;
	720	+ while (p < end) {
	721	+ if (!(q = strchr(p, '/')))
	722	+ q = end;
	723	+ *q = '\0';
	724	+ html_txt("/");
	725	+ cgit_self_link(p, NULL, NULL, ctx);
	726	+ if (q < end)
	727	+ *q = '/';
	728	+ p = q + 1;
	729	+ }
	730	+ ctx->qry.path = old_path;
649	731	}
650	732
651	733	static void print_header(struct cgit_context *ctx)
@@ -697,41 +779,37 @@ static void print_header(struct cgit_context *ctx) · 45 unmodified lines
697	779
698	780	void cgit_print_pageheader(struct cgit_context *ctx)
699	781	{
700		− struct cgit_cmd *cmd = cgit_get_cmd(ctx);
701		−
702		− if (!cmd && ctx->repo)
703		− fallback_cmd = "summary";
704		−
705	782	html("<div id='cgit'>");
706	783	if (!ctx->cfg.noheader)
707	784	print_header(ctx);
708	785
709	786	html("<table class='tabs'><tr><td>\n");
710	787	if (ctx->repo) {
711		− cgit_summary_link("summary", NULL, hc(cmd, "summary"),
	788	+ cgit_summary_link("summary", NULL, hc(ctx, "summary"),
712	789	ctx->qry.head);
713		− cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head,
714		− ctx->qry.sha1, NULL);
715		− cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head,
716		− NULL, NULL, 0, NULL, NULL, ctx->qry.showmsg);
717		− cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head,
	790	+ cgit_refs_link("refs", NULL, hc(ctx, "refs"), ctx->qry.head,
718	791	ctx->qry.sha1, NULL);
719		− cgit_commit_link("commit", NULL, hc(cmd, "commit"),
720		− ctx->qry.head, ctx->qry.sha1, 0);
721		− cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head,
722		− ctx->qry.sha1, ctx->qry.sha2, NULL, 0);
	792	+ cgit_log_link("log", NULL, hc(ctx, "log"), ctx->qry.head,
	793	+ NULL, ctx->qry.vpath, 0, NULL, NULL,
	794	+ ctx->qry.showmsg);
	795	+ cgit_tree_link("tree", NULL, hc(ctx, "tree"), ctx->qry.head,
	796	+ ctx->qry.sha1, ctx->qry.vpath);
	797	+ cgit_commit_link("commit", NULL, hc(ctx, "commit"),
	798	+ ctx->qry.head, ctx->qry.sha1, ctx->qry.vpath, 0);
	799	+ cgit_diff_link("diff", NULL, hc(ctx, "diff"), ctx->qry.head,
	800	+ ctx->qry.sha1, ctx->qry.sha2, ctx->qry.vpath, 0);
723	801	if (ctx->repo->max_stats)
724		− cgit_stats_link("stats", NULL, hc(cmd, "stats"),
725		− ctx->qry.head, NULL);
	802	+ cgit_stats_link("stats", NULL, hc(ctx, "stats"),
	803	+ ctx->qry.head, ctx->qry.vpath);
726	804	if (ctx->repo->readme)
727	805	reporevlink("about", "about", NULL,
728		− hc(cmd, "about"), ctx->qry.head, NULL,
	806	+ hc(ctx, "about"), ctx->qry.head, NULL,
729	807	NULL);
730	808	html("</td><td class='form'>");
731	809	html("<form class='right' method='get' action='");
732	810	if (ctx->cfg.virtual_root)
733	811	html_url_path(cgit_fileurl(ctx->qry.repo, "log",
734		− ctx->qry.path, NULL));
	812	+ ctx->qry.vpath, NULL));
735	813	html("'>\n");
736	814	cgit_add_hidden_formfields(1, 0, "log");
737	815	html("<select name='qt'>\n");
@@ -745,9 +823,9 @@ void cgit_print_pageheader(struct cgit_context *ctx) · 7 unmodified lines
745	823	html("<input type='submit' value='search'/>\n");
746	824	html("</form>\n");
747	825	} else {
748		− site_link(NULL, "index", NULL, hc(cmd, "repolist"), NULL, 0);
	826	+ site_link(NULL, "index", NULL, hc(ctx, "repolist"), NULL, 0);
749	827	if (ctx->cfg.root_readme)
750		− site_link("about", "about", NULL, hc(cmd, "about"),
	828	+ site_link("about", "about", NULL, hc(ctx, "about"),
751	829	NULL, 0);
752	830	html("</td><td class='form'>");
753	831	html("<form method='get' action='");
@@ -760,6 +838,12 @@ void cgit_print_pageheader(struct cgit_context *ctx) · 6 unmodified lines
760	838	html("</form>");
761	839	}
762	840	html("</td></tr></table>\n");
	841	+ if (ctx->qry.vpath) {
	842	+ html("<div class='path'>");
	843	+ html("path: ");
	844	+ cgit_print_path_crumbs(ctx, ctx->qry.vpath);
	845	+ html("</div>");
	846	+ }
763	847	html("<div class='content'>");
764	848	}
765	849

ui-shared.h+43−29

@@ -10,36 +10,50 @@ extern char cgit_fileurl(const char reponame, const char *pagename, · 9 unmodified lines
10	10	extern char cgit_pageurl(const char reponame, const char *pagename,
11	11	const char *query);
12	12
13		−extern void cgit_index_link(char name, char title, char *class,
14		− char *pattern, int ofs);
15		−extern void cgit_summary_link(char name, char title, char class, char head);
16		−extern void cgit_tag_link(char name, char title, char class, char head,
17		− char *rev);
18		−extern void cgit_tree_link(char name, char title, char class, char head,
19		− char rev, char path);
20		−extern void cgit_plain_link(char name, char title, char class, char head,
21		− char rev, char path);
22		−extern void cgit_log_link(char name, char title, char class, char head,
23		− char rev, char path, int ofs, char *grep,
24		− char *pattern, int showmsg);
25		−extern void cgit_commit_link(char name, char title, char class, char head,
26		− char *rev, int toggle_ssdiff);
27		−extern void cgit_patch_link(char name, char title, char class, char head,
28		− char *rev);
29		−extern void cgit_refs_link(char name, char title, char class, char head,
30		− char rev, char path);
31		−extern void cgit_snapshot_link(char name, char title, char *class,
32		− char head, char rev, char *archivename);
33		−extern void cgit_diff_link(char name, char title, char class, char head,
34		− char new_rev, char old_rev, char *path,
35		− int toggle_ssdiff);
36		−extern void cgit_stats_link(char name, char title, char class, char head,
37		− char *path);
	13	+extern void cgit_index_link(const char name, const char title,
	14	+ const char class, const char pattern, int ofs);
	15	+extern void cgit_summary_link(const char name, const char title,
	16	+ const char class, const char head);
	17	+extern void cgit_tag_link(const char name, const char title,
	18	+ const char class, const char head,
	19	+ const char *rev);
	20	+extern void cgit_tree_link(const char name, const char title,
	21	+ const char class, const char head,
	22	+ const char rev, const char path);
	23	+extern void cgit_plain_link(const char name, const char title,
	24	+ const char class, const char head,
	25	+ const char rev, const char path);
	26	+extern void cgit_log_link(const char name, const char title,
	27	+ const char class, const char head, const char *rev,
	28	+ const char path, int ofs, const char grep,
	29	+ const char *pattern, int showmsg);
	30	+extern void cgit_commit_link(char name, const char title,
	31	+ const char class, const char head,
	32	+ const char rev, const char path,
	33	+ int toggle_ssdiff);
	34	+extern void cgit_patch_link(const char name, const char title,
	35	+ const char class, const char head,
	36	+ const char rev, const char path);
	37	+extern void cgit_refs_link(const char name, const char title,
	38	+ const char class, const char head,
	39	+ const char rev, const char path);
	40	+extern void cgit_snapshot_link(const char name, const char title,
	41	+ const char class, const char head,
	42	+ const char rev, const char archivename);
	43	+extern void cgit_diff_link(const char name, const char title,
	44	+ const char class, const char head,
	45	+ const char new_rev, const char old_rev,
	46	+ const char *path, int toggle_ssdiff);
	47	+extern void cgit_stats_link(const char name, const char title,
	48	+ const char class, const char head,
	49	+ const char *path);
	50	+extern void cgit_self_link(char name, const char title,
	51	+ const char class, struct cgit_context ctx);
38	52	extern void cgit_object_link(struct object *obj);
39	53
40		−extern void cgit_print_error(char *msg);
41		−extern void cgit_print_date(time_t secs, char *format, int local_time);
42		−extern void cgit_print_age(time_t t, time_t max_relative, char *format);
	54	+extern void cgit_print_error(const char *msg);
	55	+extern void cgit_print_date(time_t secs, const char *format, int local_time);
	56	+extern void cgit_print_age(time_t t, time_t max_relative, const char *format);
43	57	extern void cgit_print_http_headers(struct cgit_context *ctx);
44	58	extern void cgit_print_docstart(struct cgit_context *ctx);
45	59	extern void cgit_print_docend();
@@ -48,5 +62,5 @@ extern void cgit_print_filemode(unsigned short mode); · 2 unmodified lines
48	62	extern void cgit_print_snapshot_links(const char repo, const char head,
49	63	const char *hex, int snapshots);
50	64	extern void cgit_add_hidden_formfields(int incl_head, int incl_search,
51		− char *page);
	65	+ const char *page);
52	66	#endif /* UI_SHARED_H */

ui-tree.c+2−13

@@ -102,10 +102,10 @@ static void print_object(const unsigned char sha1, char path, const char *base · 101 unmodified lines
102	102	return;
103	103	}
104	104
105		− html(" (");
	105	+ htmlf("blob: %s (", sha1_to_hex(sha1));
106	106	cgit_plain_link("plain", NULL, NULL, ctx.qry.head,
107	107	curr_rev, path);
108		− htmlf(")<br/>blob: %s\n", sha1_to_hex(sha1));
	108	+ html(")\n");
109	109
110	110	if (ctx.cfg.max_blob_size && size / 1024 > ctx.cfg.max_blob_size) {
111	111	htmlf("<div class='error'>blob size (%dKB) exceeds display size limit (%dKB).</div>",
@@ -225,17 +225,10 @@ static int walk_tree(const unsigned char sha1, const char base, int baselen, · 113 unmodified lines
225	225	{
226	226	static int state;
227	227	static char buffer[PATH_MAX];
228		− char *url;
229	228
230	229	if (state == 0) {
231	230	memcpy(buffer, base, baselen);
232	231	strcpy(buffer+baselen, pathname);
233		− url = cgit_pageurl(ctx.qry.repo, "tree",
234		− fmt("h=%s&path=%s", curr_rev, buffer));
235		− html("/");
236		− cgit_tree_link(xstrdup(pathname), NULL, NULL, ctx.qry.head,
237		− curr_rev, buffer);
238		−
239	232	if (strcmp(match_path, buffer))
240	233	return READ_TREE_RECURSIVE;
241	234
@@ -278,10 +271,6 @@ void cgit_print_tree(const char rev, char path) · 36 unmodified lines
278	271	return;
279	272	}
280	273
281		− html("path: <a href='");
282		− html_attr(cgit_pageurl(ctx.qry.repo, "tree", fmt("h=%s", rev)));
283		− html("'>root</a>");
284		−
285	274	if (path == NULL) {
286	275	ls_tree(commit->tree->object.sha1, NULL);
287	276	return;