summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ui-commit.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/ui-commit.c b/ui-commit.c
index b3a2063..1793921 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -26,98 +26,102 @@ void cgit_print_commit(char *hex, const char *prefix)
26 26
27 if (get_sha1(hex, sha1)) { 27 if (get_sha1(hex, sha1)) {
28 cgit_print_error(fmt("Bad object id: %s", hex)); 28 cgit_print_error(fmt("Bad object id: %s", hex));
29 return; 29 return;
30 } 30 }
31 commit = lookup_commit_reference(sha1); 31 commit = lookup_commit_reference(sha1);
32 if (!commit) { 32 if (!commit) {
33 cgit_print_error(fmt("Bad commit reference: %s", hex)); 33 cgit_print_error(fmt("Bad commit reference: %s", hex));
34 return; 34 return;
35 } 35 }
36 info = cgit_parse_commit(commit); 36 info = cgit_parse_commit(commit);
37 37
38 load_ref_decorations(DECORATE_FULL_REFS); 38 load_ref_decorations(DECORATE_FULL_REFS);
39 39
40 html("<table summary='commit info' class='commit-info'>\n"); 40 html("<table summary='commit info' class='commit-info'>\n");
41 html("<tr><th>author</th><td>"); 41 html("<tr><th>author</th><td>");
42 html_txt(info->author); 42 html_txt(info->author);
43 if (!ctx.cfg.noplainemail) { 43 if (!ctx.cfg.noplainemail) {
44 html(" "); 44 html(" ");
45 html_txt(info->author_email); 45 html_txt(info->author_email);
46 } 46 }
47 html("</td><td class='right'>"); 47 html("</td><td class='right'>");
48 cgit_print_date(info->author_date, FMT_LONGDATE, ctx.cfg.local_time); 48 cgit_print_date(info->author_date, FMT_LONGDATE, ctx.cfg.local_time);
49 html("</td></tr>\n"); 49 html("</td></tr>\n");
50 html("<tr><th>committer</th><td>"); 50 html("<tr><th>committer</th><td>");
51 html_txt(info->committer); 51 html_txt(info->committer);
52 if (!ctx.cfg.noplainemail) { 52 if (!ctx.cfg.noplainemail) {
53 html(" "); 53 html(" ");
54 html_txt(info->committer_email); 54 html_txt(info->committer_email);
55 } 55 }
56 html("</td><td class='right'>"); 56 html("</td><td class='right'>");
57 cgit_print_date(info->committer_date, FMT_LONGDATE, ctx.cfg.local_time); 57 cgit_print_date(info->committer_date, FMT_LONGDATE, ctx.cfg.local_time);
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, 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, 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, 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);
72 cgit_tree_link(sha1_to_hex(commit->tree->object.sha1), NULL, NULL, 72 cgit_tree_link(sha1_to_hex(commit->tree->object.sha1), NULL, NULL,
73 ctx.qry.head, tmp, NULL); 73 ctx.qry.head, tmp, NULL);
74 if (prefix) {
75 html(" /");
76 cgit_tree_link(prefix, NULL, NULL, ctx.qry.head, tmp, prefix);
77 }
74 html("</td></tr>\n"); 78 html("</td></tr>\n");
75 for (p = commit->parents; p ; p = p->next) { 79 for (p = commit->parents; p ; p = p->next) {
76 parent = lookup_commit_reference(p->item->object.sha1); 80 parent = lookup_commit_reference(p->item->object.sha1);
77 if (!parent) { 81 if (!parent) {
78 html("<tr><td colspan='3'>"); 82 html("<tr><td colspan='3'>");
79 cgit_print_error("Error reading parent commit"); 83 cgit_print_error("Error reading parent commit");
80 html("</td></tr>"); 84 html("</td></tr>");
81 continue; 85 continue;
82 } 86 }
83 html("<tr><th>parent</th>" 87 html("<tr><th>parent</th>"
84 "<td colspan='2' class='sha1'>"); 88 "<td colspan='2' class='sha1'>");
85 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,
86 ctx.qry.head, sha1_to_hex(p->item->object.sha1), 0); 90 ctx.qry.head, sha1_to_hex(p->item->object.sha1), 0);
87 html(" ("); 91 html(" (");
88 cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex, 92 cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex,
89 sha1_to_hex(p->item->object.sha1), NULL, 0); 93 sha1_to_hex(p->item->object.sha1), prefix, 0);
90 html(")</td></tr>"); 94 html(")</td></tr>");
91 parents++; 95 parents++;
92 } 96 }
93 if (ctx.repo->snapshots) { 97 if (ctx.repo->snapshots) {
94 html("<tr><th>download</th><td colspan='2' class='sha1'>"); 98 html("<tr><th>download</th><td colspan='2' class='sha1'>");
95 cgit_print_snapshot_links(ctx.qry.repo, ctx.qry.head, 99 cgit_print_snapshot_links(ctx.qry.repo, ctx.qry.head,
96 hex, ctx.repo->snapshots); 100 hex, ctx.repo->snapshots);
97 html("</td></tr>"); 101 html("</td></tr>");
98 } 102 }
99 html("</table>\n"); 103 html("</table>\n");
100 html("<div class='commit-subject'>"); 104 html("<div class='commit-subject'>");
101 if (ctx.repo->commit_filter) 105 if (ctx.repo->commit_filter)
102 cgit_open_filter(ctx.repo->commit_filter); 106 cgit_open_filter(ctx.repo->commit_filter);
103 html_txt(info->subject); 107 html_txt(info->subject);
104 if (ctx.repo->commit_filter) 108 if (ctx.repo->commit_filter)
105 cgit_close_filter(ctx.repo->commit_filter); 109 cgit_close_filter(ctx.repo->commit_filter);
106 show_commit_decorations(commit); 110 show_commit_decorations(commit);
107 html("</div>"); 111 html("</div>");
108 html("<div class='commit-msg'>"); 112 html("<div class='commit-msg'>");
109 if (ctx.repo->commit_filter) 113 if (ctx.repo->commit_filter)
110 cgit_open_filter(ctx.repo->commit_filter); 114 cgit_open_filter(ctx.repo->commit_filter);
111 html_txt(info->msg); 115 html_txt(info->msg);
112 if (ctx.repo->commit_filter) 116 if (ctx.repo->commit_filter)
113 cgit_close_filter(ctx.repo->commit_filter); 117 cgit_close_filter(ctx.repo->commit_filter);
114 html("</div>"); 118 html("</div>");
115 if (parents < 3) { 119 if (parents < 3) {
116 if (parents) 120 if (parents)
117 tmp = sha1_to_hex(commit->parents->item->object.sha1); 121 tmp = sha1_to_hex(commit->parents->item->object.sha1);
118 else 122 else
119 tmp = NULL; 123 tmp = NULL;
120 cgit_print_diff(ctx.qry.sha1, tmp, prefix); 124 cgit_print_diff(ctx.qry.sha1, tmp, prefix);
121 } 125 }
122 cgit_free_commitinfo(info); 126 cgit_free_commitinfo(info);
123} 127}