ui-log: Change display of full commit messages (and notes)

When showmsg is enabled, ui-log (in addition to the table row containing
the details of the current commit) adds a second table row containing the
remainder of the commit message, and yet another table row containing the
commit notes (if any). The vertical margins between commit subject, commit
message and commit notes are controlled by CSS.

In preparation for the commit graph (which will be printed to the left of
the commit message/notes) we need to eliminate these vertical margins (as
they would produce ugly gaps in the commit graph) and instead achieve them
by adding newlines to the commit message/notes. Furthermore, we can no
longer print the "Notes:" header in the "Age" column, since the graph will
be drawn between the "Age" column and the "Commit message" column.

This patch therefore prepares the commit message and commit notes in a
single buffer (properly formatting the notes using the NOTES_SHOW_HEADER
and NOTES_INDENT flags to format_note()), and then prints the entire
buffer into a single table row.

Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>

2 files changed, 18 insertions, 25 deletions

diff --git a/cgit.css b/cgit.css
index 0c88b65..7a5f423 100644
--- a/cgit.css
+++ b/cgit.css
@@ -156,28 +156,17 @@ table.list td {
 table.list td.logsubject {
 	font-family: monospace;
 	font-weight: bold;
 }
 
 table.list td.logmsg {
 	font-family: monospace;
 	white-space: pre;
-	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;
+	padding: 0 0.5em;
 }
 
 table.list td a {
 	color: black;
 }
 
 table.list td a.ls-dir {
 	font-weight: bold;
diff --git a/ui-log.c b/ui-log.c
index 27f5a1a..6d7fcae 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -106,39 +106,43 @@ void print_commit(struct commit *commit)
 		html("</td><td>");
 		htmlf("%d", files);
 		if (ctx.repo->enable_log_linecount) {
 			html("</td><td>");
 			htmlf("-%d/+%d", rem_lines, add_lines);
 		}
 	}
 	html("</td></tr>\n");
-	if (ctx.qry.showmsg) {
-		struct strbuf notes = STRBUF_INIT;
-		format_note(NULL, commit->object.sha1, &notes, PAGE_ENCODING, 0);
+
+	if (ctx.qry.showmsg) { /* Print message + notes in a second table row */
+		/* Concatenate commit message and notes in msgbuf */
+		struct strbuf msgbuf = STRBUF_INIT;
+		if (info->msg && *(info->msg)) {
+			strbuf_addstr(&msgbuf, info->msg);
+			strbuf_addch(&msgbuf, '\n');
+		}
+		format_note(NULL, commit->object.sha1, &msgbuf, PAGE_ENCODING,
+		            NOTES_SHOW_HEADER | NOTES_INDENT);
+		strbuf_addch(&msgbuf, '\n');
+		strbuf_ltrim(&msgbuf);
 
 		if (ctx.repo->enable_log_filecount) {
 			cols++;
 			if (ctx.repo->enable_log_linecount)
 				cols++;
 		}
+
+		/* Create second table row containing msgbuf */
 		htmlf("<tr class='nohover'><td/><td colspan='%d' class='logmsg'>",
 			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_txt(msgbuf.buf);
 			html("</td></tr>\n");
+		strbuf_release(&msgbuf);
 		}
-		strbuf_release(&notes);
-	}
+
 	cgit_free_commitinfo(info);
 }
 
 static const char *disambiguate_ref(const char *ref)
 {
 	unsigned char sha1[20];
 	const char *longref;