summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2006-12-16 13:28:26 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2006-12-16 13:28:26 (UTC)
commit8960d267ed2029ad6695488614c015d506de465c (patch) (unidiff)
treefbcc401d0f96fa01ccf57990e54444ed1d4c0777
parent77078ba716ccdfdc954741355dd6a17632db961b (diff)
downloadcgit-8960d267ed2029ad6695488614c015d506de465c.zip
cgit-8960d267ed2029ad6695488614c015d506de465c.tar.gz
cgit-8960d267ed2029ad6695488614c015d506de465c.tar.bz2
Show emails and timestamps in ui-commit.c
Use the extra info found in commitinfo struct when generating commit view. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ui-commit.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/ui-commit.c b/ui-commit.c
index 2d36015..e9de411 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -24,54 +24,60 @@ void cgit_print_commit(const char *hex)
24 return; 24 return;
25 } 25 }
26 26
27 buf = read_sha1_file(sha1, type, &size); 27 buf = read_sha1_file(sha1, type, &size);
28 if (!buf) { 28 if (!buf) {
29 cgit_print_error(fmt("Bad object reference: %s", hex)); 29 cgit_print_error(fmt("Bad object reference: %s", hex));
30 return; 30 return;
31 } 31 }
32 32
33 commit = lookup_commit(sha1); 33 commit = lookup_commit(sha1);
34 if (!commit) { 34 if (!commit) {
35 cgit_print_error(fmt("Bad commit reference: %s", hex)); 35 cgit_print_error(fmt("Bad commit reference: %s", hex));
36 return; 36 return;
37 } 37 }
38 38
39 commit->buffer = buf; 39 commit->buffer = buf;
40 if (parse_commit_buffer(commit, buf, size)) { 40 if (parse_commit_buffer(commit, buf, size)) {
41 cgit_print_error(fmt("Malformed commit buffer: %s", hex)); 41 cgit_print_error(fmt("Malformed commit buffer: %s", hex));
42 return; 42 return;
43 } 43 }
44 44
45 info = cgit_parse_commit(commit); 45 info = cgit_parse_commit(commit);
46 46
47 html("<table class='commit-info'>\n"); 47 html("<table class='commit-info'>\n");
48 html("<tr><th>author</th><td colspan='2'>"); 48 html("<tr><th>author</th><td>");
49 html_txt(info->author); 49 html_txt(info->author);
50 html(" ");
51 html_txt(info->author_email);
52 html("</td><td class='right'>");
53 cgit_print_date(info->author_date);
50 html("</td></tr>\n"); 54 html("</td></tr>\n");
51 html("<tr><th>committer</th><td>"); 55 html("<tr><th>committer</th><td>");
52 html_txt(info->committer); 56 html_txt(info->committer);
57 html(" ");
58 html_txt(info->committer_email);
53 html("</td><td class='right'>"); 59 html("</td><td class='right'>");
54 cgit_print_date(commit->date); 60 cgit_print_date(info->committer_date);
55 html("</td></tr>\n"); 61 html("</td></tr>\n");
56 html("<tr><th>tree</th><td colspan='2' class='sha1'><a href='"); 62 html("<tr><th>tree</th><td colspan='2' class='sha1'><a href='");
57 html_attr(cgit_pageurl(cgit_query_repo, "tree", fmt("id=%s", sha1_to_hex(commit->tree->object.sha1)))); 63 html_attr(cgit_pageurl(cgit_query_repo, "tree", fmt("id=%s", sha1_to_hex(commit->tree->object.sha1))));
58 htmlf("'>%s</a></td></tr>\n", sha1_to_hex(commit->tree->object.sha1)); 64 htmlf("'>%s</a></td></tr>\n", sha1_to_hex(commit->tree->object.sha1));
59 65
60 for (p = commit->parents; p ; p = p->next) { 66 for (p = commit->parents; p ; p = p->next) {
61 html("<tr><th>parent</th><td colspan='2' class='sha1'><a href='"); 67 html("<tr><th>parent</th><td colspan='2' class='sha1'><a href='");
62 html_attr(cgit_pageurl(cgit_query_repo, "commit", fmt("id=%s", sha1_to_hex(p->item->object.sha1)))); 68 html_attr(cgit_pageurl(cgit_query_repo, "commit", fmt("id=%s", sha1_to_hex(p->item->object.sha1))));
63 htmlf("'>%s</a></td></tr>\n", 69 htmlf("'>%s</a></td></tr>\n",
64 sha1_to_hex(p->item->object.sha1)); 70 sha1_to_hex(p->item->object.sha1));
65 } 71 }
66 html("</table>\n"); 72 html("</table>\n");
67 html("<div class='commit-subject'>"); 73 html("<div class='commit-subject'>");
68 html_txt(info->subject); 74 html_txt(info->subject);
69 html("</div>"); 75 html("</div>");
70 html("<div class='commit-msg'>"); 76 html("<div class='commit-msg'>");
71 html_txt(info->msg); 77 html_txt(info->msg);
72 html("</div>"); 78 html("</div>");
73 free(info->author); 79 free(info->author);
74 free(info->committer); 80 free(info->committer);
75 free(info->subject); 81 free(info->subject);
76 free(info); 82 free(info);
77} 83}