Author: Lars Hjemli <hjemli@gmail.com>
Merge branch 'jw/commit-decorations' Conflicts: cgit.css Signed-off-by: Lars Hjemli <hjemli@gmail.com>
cgit.css | 6 ++++++ tests/t0105-commit.sh | 2 +- ui-commit.c | 4 ++++ ui-log.h | 1 +
diff --git a/cgit.css b/cgit.css index f844efa7e8ae34c9f8d74f5703d218fdc5570b74..957d5aaf5786195b37a5a7aa909b8bf2364a6b26 100644 --- a/cgit.css +++ b/cgit.css @@ -500,6 +500,12 @@ padding: 0px 0.25em; background-color: #ff8888; border: solid 1px #770000; } + +div.commit-subject a { + margin-left: 1em; + font-size: 75%; +} + table.stats { border: solid 1px black; border-collapse: collapse; diff --git a/tests/t0105-commit.sh b/tests/t0105-commit.sh index a864612971aab367a1f8c6baf8254a3d8517ae6b..ae794c88de0ae24cf13eed5d26ee69a06c2b3718 100755 --- a/tests/t0105-commit.sh +++ b/tests/t0105-commit.sh @@ -9,7 +9,7 @@ run_test 'find tree link' 'grep -e "" 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' diff --git a/ui-commit.c b/ui-commit.c index a6a85a4af2dd916fd4f7fa47fcf371fb352a2715..41ce70e2a9964839b5bf8f03ba6698b7d1ac69d1 100644 --- a/ui-commit.c +++ b/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); diff --git a/ui-log.h b/ui-log.h index 877e40e2442edbbaca36192c30665ccc58168d12..603405569e90de064d5f70c5aa1454952aedde9d 100644 --- a/ui-log.h +++ b/ui-log.h @@ -3,5 +3,6 @@ #define UI_LOG_H extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern, char *path, int pager); +extern void show_commit_decorations(struct commit *commit); #endif /* UI_LOG_H */