summaryrefslogtreecommitdiffabout
path: root/ui-commit.c
authorLars Hjemli <hjemli@gmail.com>2010-02-27 12:12:55 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2010-02-27 12:12:55 (UTC)
commit581a0c2a5428917d42cbfb2b4673a2d2ebceb7d0 (patch) (unidiff)
treeed8ba775c729ea391209066aea9e58ed70ed1a5c /ui-commit.c
parente15842af627de03845b9c949f1f1596d94e3be02 (diff)
downloadcgit-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>
Diffstat (limited to 'ui-commit.c') (more/less context) (ignore whitespace changes)
-rw-r--r--ui-commit.c12
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
@@ -15,13 +15,13 @@
15void cgit_print_commit(char *hex) 15void cgit_print_commit(char *hex)
16{ 16{
17 struct commit *commit, *parent; 17 struct commit *commit, *parent;
18 struct commitinfo *info, *parent_info; 18 struct commitinfo *info, *parent_info;
19 struct commit_list *p; 19 struct commit_list *p;
20 unsigned char sha1[20]; 20 unsigned char sha1[20];
21 char *tmp; 21 char *tmp, *tmp2;
22 int parents = 0; 22 int parents = 0;
23 23
24 if (!hex) 24 if (!hex)
25 hex = ctx.qry.head; 25 hex = ctx.qry.head;
26 26
27 if (get_sha1(hex, sha1)) { 27 if (get_sha1(hex, sha1)) {
@@ -79,16 +79,18 @@ void cgit_print_commit(char *hex)
79 cgit_print_error("Error reading parent commit"); 79 cgit_print_error("Error reading parent commit");
80 html("</td></tr>"); 80 html("</td></tr>");
81 continue; 81 continue;
82 } 82 }
83 html("<tr><th>parent</th>" 83 html("<tr><th>parent</th>"
84 "<td colspan='2' class='sha1'>"); 84 "<td colspan='2' class='sha1'>");
85 parent_info = cgit_parse_commit(parent); 85 tmp = tmp2 = sha1_to_hex(p->item->object.sha1);
86 tmp = sha1_to_hex(p->item->object.sha1); 86 if (ctx.repo->enable_subject_links) {
87 cgit_commit_link(parent_info->subject, NULL, NULL, 87 parent_info = cgit_parse_commit(parent);
88 ctx.qry.head, tmp, 0); 88 tmp2 = parent_info->subject;
89 }
90 cgit_commit_link(tmp2, NULL, NULL, ctx.qry.head, tmp, 0);
89 html(" ("); 91 html(" (");
90 cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex, 92 cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex,
91 sha1_to_hex(p->item->object.sha1), NULL, 0); 93 sha1_to_hex(p->item->object.sha1), NULL, 0);
92 html(")</td></tr>"); 94 html(")</td></tr>");
93 parents++; 95 parents++;
94 } 96 }