| author | Lars Hjemli <hjemli@gmail.com> | 2010-02-27 12:12:55 (UTC) |
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2010-02-27 12:12:55 (UTC) |
| commit | 581a0c2a5428917d42cbfb2b4673a2d2ebceb7d0 (patch) (side-by-side diff) | |
| tree | ed8ba775c729ea391209066aea9e58ed70ed1a5c /ui-commit.c | |
| parent | e15842af627de03845b9c949f1f1596d94e3be02 (diff) | |
| download | cgit-581a0c2a5428917d42cbfb2b4673a2d2ebceb7d0.zip cgit-581a0c2a5428917d42cbfb2b4673a2d2ebceb7d0.tar.gz cgit-581a0c2a5428917d42cbfb2b4673a2d2ebceb7d0.tar.bz2 | |
Optionally generate verbose parent links
The new option 'enable-subject-links' must be used to enable the verbose
parent-links in commit view.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| -rw-r--r-- | ui-commit.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/ui-commit.c b/ui-commit.c index 4d4970f..41313b9 100644 --- a/ui-commit.c +++ b/ui-commit.c @@ -13,17 +13,17 @@ #include "ui-log.h" void cgit_print_commit(char *hex) { struct commit *commit, *parent; struct commitinfo *info, *parent_info; struct commit_list *p; unsigned char sha1[20]; - char *tmp; + char *tmp, *tmp2; int parents = 0; if (!hex) hex = ctx.qry.head; if (get_sha1(hex, sha1)) { cgit_print_error(fmt("Bad object id: %s", hex)); return; @@ -77,20 +77,22 @@ void cgit_print_commit(char *hex) if (!parent) { html("<tr><td colspan='3'>"); cgit_print_error("Error reading parent commit"); html("</td></tr>"); continue; } html("<tr><th>parent</th>" "<td colspan='2' class='sha1'>"); - parent_info = cgit_parse_commit(parent); - tmp = sha1_to_hex(p->item->object.sha1); - cgit_commit_link(parent_info->subject, NULL, NULL, - ctx.qry.head, tmp, 0); + tmp = tmp2 = sha1_to_hex(p->item->object.sha1); + if (ctx.repo->enable_subject_links) { + parent_info = cgit_parse_commit(parent); + tmp2 = parent_info->subject; + } + cgit_commit_link(tmp2, NULL, NULL, ctx.qry.head, tmp, 0); html(" ("); cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex, sha1_to_hex(p->item->object.sha1), NULL, 0); html(")</td></tr>"); parents++; } if (ctx.repo->snapshots) { html("<tr><th>download</th><td colspan='2' class='sha1'>"); |