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) (side-by-side diff)
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) (show 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
@@ -499,8 +499,14 @@ a.deco {
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 a864612..ae794c8 100755
--- a/tests/t0105-commit.sh
+++ b/tests/t0105-commit.sh
@@ -8,9 +8,9 @@ run_test 'generate foo/commit' 'cgit_url "foo/commit" >trash/tmp'
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'
run_test 'find diffstat' 'grep -e "<table summary=.diffstat. class=.diffstat.>" trash/tmp'
diff --git a/ui-commit.c b/ui-commit.c
index a6a85a4..41ce70e 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -9,8 +9,9 @@
#include "cgit.h"
#include "html.h"
#include "ui-shared.h"
#include "ui-diff.h"
+#include "ui-log.h"
void cgit_print_commit(char *hex)
{
struct commit *commit, *parent;
@@ -33,8 +34,10 @@ void cgit_print_commit(char *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>");
html_txt(info->author);
html(" ");
@@ -86,8 +89,9 @@ void cgit_print_commit(char *hex)
}
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);
html("</div>");
diff --git a/ui-log.h b/ui-log.h
index 877e40e..6034055 100644
--- a/ui-log.h
+++ b/ui-log.h
@@ -2,6 +2,7 @@
#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 */