diff options
author | Johan Herland | 2010-06-10 01:09:35 +0200 |
---|---|---|
committer | Lars Hjemli | 2010-06-19 10:40:24 +0200 |
commit | 685872b770be2af643d00365d5358e46687f7385 (patch) | |
tree | 279a8399c3e9b189a7171df6ca009a58bf1bb8c7 /ui-commit.c | |
parent | 34c2331d2c33ea28743a2ee3e62f7337ae9887f6 (diff) | |
download | cgit-685872b770be2af643d00365d5358e46687f7385.tar.gz cgit-685872b770be2af643d00365d5358e46687f7385.tar.bz2 cgit-685872b770be2af643d00365d5358e46687f7385.zip |
ui-commit: Preserve path limit in links to commit page
This includes adding a path argument to cgit_commit_link() and updating all
its callers. The callers from within the commit page (i.e. the "commit",
"unidiff"/"side-by-side diff" and "parent" links) all preserve the path
limit of the current commit page. All other callers pass NULL (i.e. no path
limit).
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'ui-commit.c')
-rw-r--r-- | ui-commit.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/ui-commit.c b/ui-commit.c index 1793921..2d98ed9 100644 --- a/ui-commit.c +++ b/ui-commit.c | |||
@@ -58,14 +58,14 @@ void cgit_print_commit(char *hex, const char *prefix) | |||
58 | html("</td></tr>\n"); | 58 | html("</td></tr>\n"); |
59 | html("<tr><th>commit</th><td colspan='2' class='sha1'>"); | 59 | html("<tr><th>commit</th><td colspan='2' class='sha1'>"); |
60 | tmp = sha1_to_hex(commit->object.sha1); | 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 | html(" ("); | 62 | html(" ("); |
63 | cgit_patch_link("patch", NULL, NULL, NULL, tmp, prefix); | 63 | cgit_patch_link("patch", NULL, NULL, NULL, tmp, prefix); |
64 | html(") ("); | 64 | html(") ("); |
65 | if ((ctx.qry.ssdiff && !ctx.cfg.ssdiff) || (!ctx.qry.ssdiff && ctx.cfg.ssdiff)) | 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 | else | 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 | html(")</td></tr>\n"); | 69 | html(")</td></tr>\n"); |
70 | html("<tr><th>tree</th><td colspan='2' class='sha1'>"); | 70 | html("<tr><th>tree</th><td colspan='2' class='sha1'>"); |
71 | tmp = xstrdup(hex); | 71 | tmp = xstrdup(hex); |
@@ -87,7 +87,8 @@ void cgit_print_commit(char *hex, const char *prefix) | |||
87 | html("<tr><th>parent</th>" | 87 | html("<tr><th>parent</th>" |
88 | "<td colspan='2' class='sha1'>"); | 88 | "<td colspan='2' class='sha1'>"); |
89 | cgit_commit_link(sha1_to_hex(p->item->object.sha1), NULL, NULL, | 89 | cgit_commit_link(sha1_to_hex(p->item->object.sha1), NULL, NULL, |
90 | ctx.qry.head, sha1_to_hex(p->item->object.sha1), 0); | 90 | ctx.qry.head, |
91 | sha1_to_hex(p->item->object.sha1), prefix, 0); | ||
91 | html(" ("); | 92 | html(" ("); |
92 | cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex, | 93 | cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex, |
93 | sha1_to_hex(p->item->object.sha1), prefix, 0); | 94 | sha1_to_hex(p->item->object.sha1), prefix, 0); |