ui-log: Display git notes when present

Signed-off-by: Jeff Smith <whydoubt@yahoo.com>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>

diff --git a/cgit.css b/cgit.css
index 3675697d6c93eda76ee6799a2349d39cc3471f5d..0c88b65fe4cb1e5003c6bd569cefe4cd819af2a3 100644 (file)
--- a/cgit.css
+++ b/cgit.css
@@ -164,6 +164,17 @@ table.list td.logmsg {
        padding: 1em 0.5em 2em 0.5em;
 }
 
+table.list td.lognotes-label {
+       text-align:right;
+       vertical-align:top;
+}
+
+table.list td.lognotes {
+       font-family: monospace;
+       white-space: pre;
+       padding: 0em 0.5em 2em 0.5em;
+}
+
 table.list td a {
        color: black;
 }

diff --git a/ui-log.c b/ui-log.c
index ee93653384695d7337b3947c9c59505800ec853a..7f38d2acb41dc9fe451c3ba9f133eb81794b71d9 100644 (file)
--- a/ui-log.c
+++ b/ui-log.c
@@ -111,6 +111,9 @@ void print_commit(struct commit *commit)
        }
        html("</td></tr>\n");
        if (ctx.qry.showmsg) {
+               struct strbuf notes = STRBUF_INIT;
+               get_commit_notes(commit, &notes, PAGE_ENCODING, 0);
+
                if (ctx.repo->enable_log_filecount) {
                        cols++;
                        if (ctx.repo->enable_log_linecount)
@@ -120,6 +123,15 @@ void print_commit(struct commit *commit)
                        cols);
                html_txt(info->msg);
                html("</td></tr>\n");
+               if (notes.len != 0) {
+                       html("<tr class='nohover'>");
+                       html("<td class='lognotes-label'>Notes:</td>");
+                       htmlf("<td colspan='%d' class='lognotes'>",
+                               cols);
+                       html_txt(notes.buf);
+                       html("</td></tr>\n");
+               }
+               strbuf_release(&notes);
        }
        cgit_free_commitinfo(info);
 }