summaryrefslogtreecommitdiffabout
path: root/ui-log.c
authorJohan Herland <johan@herland.net>2010-06-11 12:50:47 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2010-06-19 08:40:24 (UTC)
commitafc40725c1bd5a25446a704995ce3a02270537df (patch) (side-by-side diff)
tree1a88e21aad2aa40164ad3ed84667a340679d1e3b /ui-log.c
parent7fdff2460440c09d13fc76af3b75e85434e6f563 (diff)
downloadcgit-afc40725c1bd5a25446a704995ce3a02270537df.zip
cgit-afc40725c1bd5a25446a704995ce3a02270537df.tar.gz
cgit-afc40725c1bd5a25446a704995ce3a02270537df.tar.bz2
ui-log: Preserve path limit in outgoing links
This allows navigation through the 'log' page/command without losing the active path limit. Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'ui-log.c') (more/less context) (ignore whitespace changes)
-rw-r--r--ui-log.c27
1 files changed, 15 insertions, 12 deletions
diff --git a/ui-log.c b/ui-log.c
index 282eca3..bfbe436 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -48,4 +48,5 @@ void show_commit_decorations(struct commit *commit)
strncpy(buf, deco->name + 11, sizeof(buf) - 1);
- cgit_log_link(buf, NULL, "branch-deco", buf, NULL, NULL,
- 0, NULL, NULL, ctx.qry.showmsg);
+ cgit_log_link(buf, NULL, "branch-deco", buf, NULL,
+ ctx.qry.vpath, 0, NULL, NULL,
+ ctx.qry.showmsg);
}
@@ -62,4 +63,5 @@ void show_commit_decorations(struct commit *commit)
cgit_log_link(buf, NULL, "remote-deco", NULL,
- sha1_to_hex(commit->object.sha1), NULL,
- 0, NULL, NULL, ctx.qry.showmsg);
+ sha1_to_hex(commit->object.sha1),
+ ctx.qry.vpath, 0, NULL, NULL,
+ ctx.qry.showmsg);
}
@@ -68,3 +70,4 @@ void show_commit_decorations(struct commit *commit)
cgit_commit_link(buf, NULL, "deco", ctx.qry.head,
- sha1_to_hex(commit->object.sha1), NULL, 0);
+ sha1_to_hex(commit->object.sha1),
+ ctx.qry.vpath, 0);
}
@@ -84,3 +87,3 @@ void print_commit(struct commit *commit)
tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1));
- tmp = cgit_pageurl(ctx.repo->url, "commit", tmp);
+ tmp = cgit_fileurl(ctx.repo->url, "commit", ctx.qry.vpath, tmp);
html_link_open(tmp, NULL, NULL);
@@ -91,3 +94,3 @@ void print_commit(struct commit *commit)
cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head,
- sha1_to_hex(commit->object.sha1), NULL, 0);
+ sha1_to_hex(commit->object.sha1), ctx.qry.vpath, 0);
show_commit_decorations(commit);
@@ -178,3 +181,3 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
NULL, ctx.qry.head, ctx.qry.sha1,
- ctx.qry.path, ctx.qry.ofs, ctx.qry.grep,
+ ctx.qry.vpath, ctx.qry.ofs, ctx.qry.grep,
ctx.qry.search, ctx.qry.showmsg ? 0 : 1);
@@ -215,3 +218,3 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
cgit_log_link("[prev]", NULL, NULL, ctx.qry.head,
- ctx.qry.sha1, ctx.qry.path,
+ ctx.qry.sha1, ctx.qry.vpath,
ofs - cnt, ctx.qry.grep,
@@ -222,3 +225,3 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
cgit_log_link("[next]", NULL, NULL, ctx.qry.head,
- ctx.qry.sha1, ctx.qry.path,
+ ctx.qry.sha1, ctx.qry.vpath,
ofs + cnt, ctx.qry.grep,
@@ -229,4 +232,4 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
html("<tr class='nohover'><td colspan='3'>");
- cgit_log_link("[...]", NULL, NULL, ctx.qry.head, NULL, NULL, 0,
- NULL, NULL, ctx.qry.showmsg);
+ cgit_log_link("[...]", NULL, NULL, ctx.qry.head, NULL,
+ ctx.qry.vpath, 0, NULL, NULL, ctx.qry.showmsg);
html("</td></tr>\n");