crtxcr/cgitsb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'jw/commit-decorations'

Browse Source 
Conflicts:
	cgit.css

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
This commit is contained in:
Lars Hjemli 2009-01-27 23:00:40 +01:00
commit dfc4c82aad
4 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cgit.css
View File

@ -500,6 +500,12 @@ a.deco {
background-color: #ff8888; background-color: #ff8888;
border: solid 1px #770000; border: solid 1px #770000;
} }
div.commit-subject a {
margin-left: 1em;
font-size: 75%;
}
table.stats { table.stats {
border: solid 1px black; border: solid 1px black;
border-collapse: collapse; border-collapse: collapse;

2
tests/t0105-commit.sh
View File

@ -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 parent link' 'grep -E "<a href=./foo/commit/\?id=.+>" trash/tmp'
run_test 'find commit subject' ' 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' run_test 'find commit msg' 'grep -e "<div class=.commit-msg.></div>" trash/tmp'

4
ui-commit.c
View File

@ -10,6 +10,7 @@
#include "html.h" #include "html.h"
#include "ui-shared.h" #include "ui-shared.h"
#include "ui-diff.h" #include "ui-diff.h"
#include "ui-log.h"
void cgit_print_commit(char *hex) void cgit_print_commit(char *hex)
{ {
@ -34,6 +35,8 @@ void cgit_print_commit(char *hex)
} }
info = cgit_parse_commit(commit); info = cgit_parse_commit(commit);
load_ref_decorations();
html("<table summary='commit info' class='commit-info'>\n"); html("<table summary='commit info' class='commit-info'>\n");
html("<tr><th>author</th><td>"); html("<tr><th>author</th><td>");
html_txt(info->author); html_txt(info->author);
@ -87,6 +90,7 @@ void cgit_print_commit(char *hex)
html("</table>\n"); html("</table>\n");
html("<div class='commit-subject'>"); html("<div class='commit-subject'>");
html_txt(info->subject); html_txt(info->subject);
show_commit_decorations(commit);
html("</div>"); html("</div>");
html("<div class='commit-msg'>"); html("<div class='commit-msg'>");
html_txt(info->msg); html_txt(info->msg);

1
ui-log.h
View File

@ -3,5 +3,6 @@
extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep,
char *pattern, char *path, int pager); char *pattern, char *path, int pager);
extern void show_commit_decorations(struct commit *commit);
#endif /* UI_LOG_H */ #endif /* UI_LOG_H */