all repos — cgit @ dfc4c82aad1ca990544441ce8b90e99d32f0d82d

a hyperfast web frontend for git written in c

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
commit

dfc4c82aad1ca990544441ce8b90e99d32f0d82d

parent

1fdde95a5a169ad2240460b1d3f25bae606527f5

4 files changed, 12 insertions(+), 1 deletions(-)

jump to
M cgit.csscgit.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;
M tests/t0105-commit.shtests/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.cui-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);
M ui-log.hui-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 */