Merge branch 'jw/commit-decorations' Conflicts: cgit.css Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Lars Hjemli hjemli@gmail.com
Tue, 27 Jan 2009 23:00:40 +0100
4 files changed,
12 insertions(+),
1 deletions(-)
M
tests/t0105-commit.sh
→
tests/t0105-commit.sh
@@ -9,7 +9,7 @@ run_test 'find tree link' 'grep -e "<a href=./foo/tree/.>" trash/tmp'
run_test 'find parent link' 'grep -E "<a href=./foo/commit/\?id=.+>" trash/tmp' run_test 'find commit subject' ' - grep -e "<div class=.commit-subject.>commit 5</div>" trash/tmp + grep -e "<div class=.commit-subject.>commit 5<" trash/tmp ' run_test 'find commit msg' 'grep -e "<div class=.commit-msg.></div>" trash/tmp'
M
ui-commit.c
→
ui-commit.c
@@ -10,6 +10,7 @@ #include "cgit.h"
#include "html.h" #include "ui-shared.h" #include "ui-diff.h" +#include "ui-log.h" void cgit_print_commit(char *hex) {@@ -33,6 +34,8 @@ cgit_print_error(fmt("Bad commit reference: %s", hex));
return; } info = cgit_parse_commit(commit); + + load_ref_decorations(); html("<table summary='commit info' class='commit-info'>\n"); html("<tr><th>author</th><td>");@@ -87,6 +90,7 @@ }
html("</table>\n"); html("<div class='commit-subject'>"); html_txt(info->subject); + show_commit_decorations(commit); html("</div>"); html("<div class='commit-msg'>"); html_txt(info->msg);