author | Lars Hjemli <hjemli@gmail.com> | 2009-01-27 22:00:40 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-01-27 22:00:40 (UTC) |
commit | dfc4c82aad1ca990544441ce8b90e99d32f0d82d (patch) (unidiff) | |
tree | 97d9fb47782db966626a35ed7ec050f626f8ff71 /ui-commit.c | |
parent | 1fdde95a5a169ad2240460b1d3f25bae606527f5 (diff) | |
parent | 38fde35f9a28263e3e89dc9504cb8fb72d98a748 (diff) | |
download | cgit-dfc4c82aad1ca990544441ce8b90e99d32f0d82d.zip cgit-dfc4c82aad1ca990544441ce8b90e99d32f0d82d.tar.gz cgit-dfc4c82aad1ca990544441ce8b90e99d32f0d82d.tar.bz2 |
Merge branch 'jw/commit-decorations'
Conflicts:
cgit.css
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | ui-commit.c | 4 |
1 files changed, 4 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 | |||
@@ -7,12 +7,13 @@ | |||
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 | ||
14 | void cgit_print_commit(char *hex) | 15 | void 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; |
@@ -31,12 +32,14 @@ void cgit_print_commit(char *hex) | |||
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'>"); |
@@ -84,12 +87,13 @@ void cgit_print_commit(char *hex) | |||
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) |