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-log.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-log.c | 12 |
1 files changed, 12 insertions, 0 deletions
@@ -111,6 +111,9 @@ void print_commit(struct commit *commit) | |||
111 | } | 111 | } |
112 | html("</td></tr>\n"); | 112 | html("</td></tr>\n"); |
113 | if (ctx.qry.showmsg) { | 113 | if (ctx.qry.showmsg) { |
114 | struct strbuf notes = STRBUF_INIT; | ||
115 | get_commit_notes(commit, ¬es, PAGE_ENCODING, 0); | ||
116 | |||
114 | if (ctx.repo->enable_log_filecount) { | 117 | if (ctx.repo->enable_log_filecount) { |
115 | cols++; | 118 | cols++; |
116 | if (ctx.repo->enable_log_linecount) | 119 | if (ctx.repo->enable_log_linecount) |
@@ -120,6 +123,15 @@ void print_commit(struct commit *commit) | |||
120 | cols); | 123 | cols); |
121 | html_txt(info->msg); | 124 | html_txt(info->msg); |
122 | html("</td></tr>\n"); | 125 | html("</td></tr>\n"); |
126 | if (notes.len != 0) { | ||
127 | html("<tr class='nohover'>"); | ||
128 | html("<td class='lognotes-label'>Notes:</td>"); | ||
129 | htmlf("<td colspan='%d' class='lognotes'>", | ||
130 | cols); | ||
131 | html_txt(notes.buf); | ||
132 | html("</td></tr>\n"); | ||
133 | } | ||
134 | strbuf_release(¬es); | ||
123 | } | 135 | } |
124 | cgit_free_commitinfo(info); | 136 | cgit_free_commitinfo(info); |
125 | } | 137 | } |