| 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) (unidiff) | |
| tree | 4a12cf7645b89c06684e09a1e5dded9a5ddeae38 /ui-commit.c | |
| 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-- | ui-commit.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/ui-commit.c b/ui-commit.c index a11bc5f..45af450 100644 --- a/ui-commit.c +++ b/ui-commit.c | |||
| @@ -18,4 +18,5 @@ void cgit_print_commit(char *hex, const char *prefix) | |||
| 18 | struct commitinfo *info, *parent_info; | 18 | struct commitinfo *info, *parent_info; |
| 19 | struct commit_list *p; | 19 | struct commit_list *p; |
| 20 | struct strbuf notes = STRBUF_INIT; | ||
| 20 | unsigned char sha1[20]; | 21 | unsigned char sha1[20]; |
| 21 | char *tmp, *tmp2; | 22 | char *tmp, *tmp2; |
| @@ -36,4 +37,6 @@ void cgit_print_commit(char *hex, const char *prefix) | |||
| 36 | info = cgit_parse_commit(commit); | 37 | info = cgit_parse_commit(commit); |
| 37 | 38 | ||
| 39 | get_commit_notes(commit, ¬es, PAGE_ENCODING, 0); | ||
| 40 | |||
| 38 | load_ref_decorations(DECORATE_FULL_REFS); | 41 | load_ref_decorations(DECORATE_FULL_REFS); |
| 39 | 42 | ||
| @@ -121,4 +124,15 @@ void cgit_print_commit(char *hex, const char *prefix) | |||
| 121 | cgit_close_filter(ctx.repo->commit_filter); | 124 | cgit_close_filter(ctx.repo->commit_filter); |
| 122 | html("</div>"); | 125 | html("</div>"); |
| 126 | if (notes.len != 0) { | ||
| 127 | html("<div class='notes-header'>Notes</div>"); | ||
| 128 | html("<div class='notes'>"); | ||
| 129 | if (ctx.repo->commit_filter) | ||
| 130 | cgit_open_filter(ctx.repo->commit_filter); | ||
| 131 | html_txt(notes.buf); | ||
| 132 | if (ctx.repo->commit_filter) | ||
| 133 | cgit_close_filter(ctx.repo->commit_filter); | ||
| 134 | html("</div>"); | ||
| 135 | html("<div class='notes-footer'></div>"); | ||
| 136 | } | ||
| 123 | if (parents < 3) { | 137 | if (parents < 3) { |
| 124 | if (parents) | 138 | if (parents) |
| @@ -128,4 +142,5 @@ void cgit_print_commit(char *hex, const char *prefix) | |||
| 128 | cgit_print_diff(ctx.qry.sha1, tmp, prefix); | 142 | cgit_print_diff(ctx.qry.sha1, tmp, prefix); |
| 129 | } | 143 | } |
| 144 | strbuf_release(¬es); | ||
| 130 | cgit_free_commitinfo(info); | 145 | cgit_free_commitinfo(info); |
| 131 | } | 146 | } |