author | Lars Hjemli <hjemli@gmail.com> | 2010-08-04 01:10:24 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-08-04 01:10:24 (UTC) |
commit | e6c960c7c0f0d2e54b51cc43ef190df3ce52755e (patch) (unidiff) | |
tree | 29b49ca32a3de23b58ef5c2b7e522b607b60f356 /ui-commit.c | |
parent | 6a8f65bf184d85a0c51ffecca16f48e6f4b1ff12 (diff) | |
parent | 39c2e224d3c55dfa1a7668399897be295be07dc7 (diff) | |
download | cgit-e6c960c7c0f0d2e54b51cc43ef190df3ce52755e.zip cgit-e6c960c7c0f0d2e54b51cc43ef190df3ce52755e.tar.gz cgit-e6c960c7c0f0d2e54b51cc43ef190df3ce52755e.tar.bz2 |
Merge branch 'js/notes'
-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 | |||
@@ -19,2 +19,3 @@ void cgit_print_commit(char *hex, const char *prefix) | |||
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]; |
@@ -37,2 +38,4 @@ void cgit_print_commit(char *hex, const char *prefix) | |||
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); |
@@ -122,2 +125,13 @@ void cgit_print_commit(char *hex, const char *prefix) | |||
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) { |
@@ -129,2 +143,3 @@ void cgit_print_commit(char *hex, const char *prefix) | |||
129 | } | 143 | } |
144 | strbuf_release(¬es); | ||
130 | cgit_free_commitinfo(info); | 145 | cgit_free_commitinfo(info); |