| author | Lars Hjemli <hjemli@gmail.com> | 2010-06-22 14:15:48 (UTC) |
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2010-06-22 14:15:48 (UTC) |
| commit | 37a24e4e39737edaa5cdde501346a65eeb280e63 (patch) (side-by-side diff) | |
| tree | ff23eb0d57edf108edd1aa3e64a8d6cf70062954 /ui-commit.c | |
| parent | 47187b33be1c3de43fbed6f350ab05bc978aacd0 (diff) | |
| parent | a2cbd3c30b64a26b52b2003ba6569f3c083f4092 (diff) | |
| download | cgit-37a24e4e39737edaa5cdde501346a65eeb280e63.zip cgit-37a24e4e39737edaa5cdde501346a65eeb280e63.tar.gz cgit-37a24e4e39737edaa5cdde501346a65eeb280e63.tar.bz2 | |
Merge branch 'jh/path-limit'
Conflicts:
cgit.h
ui-commit.c
| -rw-r--r-- | ui-commit.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/ui-commit.c b/ui-commit.c index 41313b9..a11bc5f 100644 --- a/ui-commit.c +++ b/ui-commit.c @@ -14,3 +14,3 @@ -void cgit_print_commit(char *hex) +void cgit_print_commit(char *hex, const char *prefix) { @@ -60,10 +60,10 @@ void cgit_print_commit(char *hex) tmp = sha1_to_hex(commit->object.sha1); - cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp, 0); + cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp, prefix, 0); html(" ("); - cgit_patch_link("patch", NULL, NULL, NULL, tmp); + cgit_patch_link("patch", NULL, NULL, NULL, tmp, prefix); html(") ("); if ((ctx.qry.ssdiff && !ctx.cfg.ssdiff) || (!ctx.qry.ssdiff && ctx.cfg.ssdiff)) - cgit_commit_link("unidiff", NULL, NULL, ctx.qry.head, tmp, 1); + cgit_commit_link("unidiff", NULL, NULL, ctx.qry.head, tmp, prefix, 1); else - cgit_commit_link("side-by-side diff", NULL, NULL, ctx.qry.head, tmp, 1); + cgit_commit_link("side-by-side diff", NULL, NULL, ctx.qry.head, tmp, prefix, 1); html(")</td></tr>\n"); @@ -73,2 +73,6 @@ void cgit_print_commit(char *hex) ctx.qry.head, tmp, NULL); + if (prefix) { + html(" /"); + cgit_tree_link(prefix, NULL, NULL, ctx.qry.head, tmp, prefix); + } html("</td></tr>\n"); @@ -89,6 +93,6 @@ void cgit_print_commit(char *hex) } - cgit_commit_link(tmp2, NULL, NULL, ctx.qry.head, tmp, 0); + cgit_commit_link(tmp2, NULL, NULL, ctx.qry.head, tmp, prefix, 0); html(" ("); cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex, - sha1_to_hex(p->item->object.sha1), NULL, 0); + sha1_to_hex(p->item->object.sha1), prefix, 0); html(")</td></tr>"); @@ -123,3 +127,3 @@ void cgit_print_commit(char *hex) tmp = NULL; - cgit_print_diff(ctx.qry.sha1, tmp, NULL); + cgit_print_diff(ctx.qry.sha1, tmp, prefix); } |