summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--ui-commit.c4
-rw-r--r--ui-log.h1
2 files changed, 5 insertions, 0 deletions
diff --git a/ui-commit.c b/ui-commit.c
index a6a85a4..41ce70e 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -5,16 +5,17 @@
5 * Licensed under GNU General Public License v2 5 * Licensed under GNU General Public License v2
6 * (see COPYING for full license text) 6 * (see COPYING for full license text)
7 */ 7 */
8 8
9#include "cgit.h" 9#include "cgit.h"
10#include "html.h" 10#include "html.h"
11#include "ui-shared.h" 11#include "ui-shared.h"
12#include "ui-diff.h" 12#include "ui-diff.h"
13#include "ui-log.h"
13 14
14void cgit_print_commit(char *hex) 15void cgit_print_commit(char *hex)
15{ 16{
16 struct commit *commit, *parent; 17 struct commit *commit, *parent;
17 struct commitinfo *info; 18 struct commitinfo *info;
18 struct commit_list *p; 19 struct commit_list *p;
19 unsigned char sha1[20]; 20 unsigned char sha1[20];
20 char *tmp; 21 char *tmp;
@@ -29,16 +30,18 @@ void cgit_print_commit(char *hex)
29 } 30 }
30 commit = lookup_commit_reference(sha1); 31 commit = lookup_commit_reference(sha1);
31 if (!commit) { 32 if (!commit) {
32 cgit_print_error(fmt("Bad commit reference: %s", hex)); 33 cgit_print_error(fmt("Bad commit reference: %s", hex));
33 return; 34 return;
34 } 35 }
35 info = cgit_parse_commit(commit); 36 info = cgit_parse_commit(commit);
36 37
38 load_ref_decorations();
39
37 html("<table summary='commit info' class='commit-info'>\n"); 40 html("<table summary='commit info' class='commit-info'>\n");
38 html("<tr><th>author</th><td>"); 41 html("<tr><th>author</th><td>");
39 html_txt(info->author); 42 html_txt(info->author);
40 html(" "); 43 html(" ");
41 html_txt(info->author_email); 44 html_txt(info->author_email);
42 html("</td><td class='right'>"); 45 html("</td><td class='right'>");
43 cgit_print_date(info->author_date, FMT_LONGDATE, ctx.cfg.local_time); 46 cgit_print_date(info->author_date, FMT_LONGDATE, ctx.cfg.local_time);
44 html("</td></tr>\n"); 47 html("</td></tr>\n");
@@ -82,16 +85,17 @@ void cgit_print_commit(char *hex)
82 html("<tr><th>download</th><td colspan='2' class='sha1'>"); 85 html("<tr><th>download</th><td colspan='2' class='sha1'>");
83 cgit_print_snapshot_links(ctx.qry.repo, ctx.qry.head, 86 cgit_print_snapshot_links(ctx.qry.repo, ctx.qry.head,
84 hex, ctx.repo->snapshots); 87 hex, ctx.repo->snapshots);
85 html("</td></tr>"); 88 html("</td></tr>");
86 } 89 }
87 html("</table>\n"); 90 html("</table>\n");
88 html("<div class='commit-subject'>"); 91 html("<div class='commit-subject'>");
89 html_txt(info->subject); 92 html_txt(info->subject);
93 show_commit_decorations(commit);
90 html("</div>"); 94 html("</div>");
91 html("<div class='commit-msg'>"); 95 html("<div class='commit-msg'>");
92 html_txt(info->msg); 96 html_txt(info->msg);
93 html("</div>"); 97 html("</div>");
94 if (parents < 3) { 98 if (parents < 3) {
95 if (parents) 99 if (parents)
96 tmp = sha1_to_hex(commit->parents->item->object.sha1); 100 tmp = sha1_to_hex(commit->parents->item->object.sha1);
97 else 101 else
diff --git a/ui-log.h b/ui-log.h
index 877e40e..6034055 100644
--- a/ui-log.h
+++ b/ui-log.h
@@ -1,7 +1,8 @@
1#ifndef UI_LOG_H 1#ifndef UI_LOG_H
2#define UI_LOG_H 2#define UI_LOG_H
3 3
4extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, 4extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep,
5 char *pattern, char *path, int pager); 5 char *pattern, char *path, int pager);
6extern void show_commit_decorations(struct commit *commit);
6 7
7#endif /* UI_LOG_H */ 8#endif /* UI_LOG_H */