author | Jeff Smith <whydoubt@yahoo.com> | 2010-07-29 14:32:30 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-08-04 01:10:07 (UTC) |
commit | 059b39344fdcde324dff1099fc4b70c7aab12a96 (patch) (side-by-side diff) | |
tree | 4a12cf7645b89c06684e09a1e5dded9a5ddeae38 | |
parent | f9143171267e39f66a02ad2ecb0da2e8cc7f4142 (diff) | |
download | cgit-059b39344fdcde324dff1099fc4b70c7aab12a96.zip cgit-059b39344fdcde324dff1099fc4b70c7aab12a96.tar.gz cgit-059b39344fdcde324dff1099fc4b70c7aab12a96.tar.bz2 |
ui-commit: Display git notes when present
Signed-off-by: Jeff Smith <whydoubt@yahoo.com>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.css | 18 | ||||
-rw-r--r-- | cgit.h | 1 | ||||
-rw-r--r-- | ui-commit.c | 15 |
3 files changed, 34 insertions, 0 deletions
@@ -328,2 +328,20 @@ div.commit-msg { +div.notes-header { + font-weight: bold; + padding-top: 1.5em; +} + +div.notes { + white-space: pre; + font-family: monospace; + border: solid 1px #ee9; + background-color: #ffd; + padding: 0.3em 2em 0.3em 1em; + float: left; +} + +div.notes-footer { + clear: left; +} + div.diffstat-header { @@ -21,2 +21,3 @@ #include <utf8.h> +#include <notes.h> diff --git a/ui-commit.c b/ui-commit.c index a11bc5f..45af450 100644 --- a/ui-commit.c +++ b/ui-commit.c @@ -19,2 +19,3 @@ void cgit_print_commit(char *hex, const char *prefix) struct commit_list *p; + struct strbuf notes = STRBUF_INIT; unsigned char sha1[20]; @@ -37,2 +38,4 @@ void cgit_print_commit(char *hex, const char *prefix) + get_commit_notes(commit, ¬es, PAGE_ENCODING, 0); + load_ref_decorations(DECORATE_FULL_REFS); @@ -122,2 +125,13 @@ void cgit_print_commit(char *hex, const char *prefix) html("</div>"); + if (notes.len != 0) { + html("<div class='notes-header'>Notes</div>"); + html("<div class='notes'>"); + if (ctx.repo->commit_filter) + cgit_open_filter(ctx.repo->commit_filter); + html_txt(notes.buf); + if (ctx.repo->commit_filter) + cgit_close_filter(ctx.repo->commit_filter); + html("</div>"); + html("<div class='notes-footer'></div>"); + } if (parents < 3) { @@ -129,2 +143,3 @@ void cgit_print_commit(char *hex, const char *prefix) } + strbuf_release(¬es); cgit_free_commitinfo(info); |