summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Smith <whydoubt@yahoo.com>2010-07-29 09:32:31 -0500
committerLars Hjemli <hjemli@gmail.com>2010-08-04 03:10:07 +0200
commit39c2e224d3c55dfa1a7668399897be295be07dc7 (patch)
tree361f85c61886eecf153243fae1ada8a7618d8728
parent059b39344fdcde324dff1099fc4b70c7aab12a96 (diff)
ui-log: 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.css11
-rw-r--r--ui-log.c12
2 files changed, 23 insertions, 0 deletions
diff --git a/cgit.css b/cgit.css
index 3675697..0c88b65 100644
--- 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 ee93653..7f38d2a 100644
--- 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);
}