summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2009-01-27 22:00:40 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2009-01-27 22:00:40 (UTC)
commitdfc4c82aad1ca990544441ce8b90e99d32f0d82d (patch) (unidiff)
tree97d9fb47782db966626a35ed7ec050f626f8ff71
parent1fdde95a5a169ad2240460b1d3f25bae606527f5 (diff)
parent38fde35f9a28263e3e89dc9504cb8fb72d98a748 (diff)
downloadcgit-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>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.css6
-rwxr-xr-xtests/t0105-commit.sh2
-rw-r--r--ui-commit.c4
-rw-r--r--ui-log.h1
4 files changed, 12 insertions, 1 deletions
diff --git a/cgit.css b/cgit.css
index f844efa..957d5aa 100644
--- a/cgit.css
+++ b/cgit.css
@@ -501,4 +501,10 @@ a.deco {
501 border: solid 1px #770000; 501 border: solid 1px #770000;
502} 502}
503
504div.commit-subject a {
505 margin-left: 1em;
506 font-size: 75%;
507}
508
503table.stats { 509table.stats {
504 border: solid 1px black; 510 border: solid 1px black;
diff --git a/tests/t0105-commit.sh b/tests/t0105-commit.sh
index a864612..ae794c8 100755
--- a/tests/t0105-commit.sh
+++ b/tests/t0105-commit.sh
@@ -10,5 +10,5 @@ run_test 'find parent link' 'grep -E "<a href=./foo/commit/\?id=.+>" trash/tmp'
10 10
11run_test 'find commit subject' ' 11run_test 'find commit subject' '
12 grep -e "<div class=.commit-subject.>commit 5</div>" trash/tmp 12 grep -e "<div class=.commit-subject.>commit 5<" trash/tmp
13' 13'
14 14
diff --git a/ui-commit.c b/ui-commit.c
index a6a85a4..41ce70e 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -11,4 +11,5 @@
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
14void cgit_print_commit(char *hex) 15void cgit_print_commit(char *hex)
@@ -35,4 +36,6 @@ void cgit_print_commit(char *hex)
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>");
@@ -88,4 +91,5 @@ void cgit_print_commit(char *hex)
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'>");
diff --git a/ui-log.h b/ui-log.h
index 877e40e..6034055 100644
--- a/ui-log.h
+++ b/ui-log.h
@@ -4,4 +4,5 @@
4extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, 4extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep,
5 char *pattern, char *path, int pager); 5 char *pattern, char *path, int pager);
6extern void show_commit_decorations(struct commit *commit);
6 7
7#endif /* UI_LOG_H */ 8#endif /* UI_LOG_H */