Merge branch 'full-log'

Conflicts:
	cgit.c
	cgit.h

9 files changed, 61 insertions, 13 deletions

diff --git a/cgit.c b/cgit.c
index e09c86e..166fbc6 100644
--- a/cgit.c
+++ b/cgit.c
@@ -157,4 +157,6 @@ static void querystring_cb(const char *name, const char *value)
 	} else if (!strcmp(name, "s")){
 		ctx.qry.sort = xstrdup(value);
+	} else if (!strcmp(name, "showmsg")) {
+		ctx.qry.showmsg = atoi(value);
 	}
 }
diff --git a/cgit.css b/cgit.css
index a37d218..7928c2f 100644
--- a/cgit.css
+++ b/cgit.css
@@ -121,4 +121,8 @@ table.list tr {
 }
 
+table.list tr.logheader {
+	background: #eee;
+}
+
 table.list tr:hover {
 	background: #eee;
@@ -144,4 +148,15 @@ 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 0em 2em 0em;
+}
+
 table.list td a {
 	color: black;
diff --git a/cgit.h b/cgit.h
index f1fbeca..cb2f176 100644
--- a/cgit.h
+++ b/cgit.h
@@ -124,4 +124,5 @@ struct cgit_query {
 	int nohead;
 	char *sort;
+	int showmsg;
 };
 
diff --git a/ui-log.c b/ui-log.c
index d212984..2f90778 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -36,7 +36,9 @@ void print_commit(struct commit *commit)
 	struct commitinfo *info;
 	char *tmp;
+	int cols = 2;
 
 	info = cgit_parse_commit(commit);
-	html("<tr><td>");
+	htmlf("<tr%s><td>",
+		ctx.qry.showmsg ? " class='logheader'" : "");
 	tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1));
 	tmp = cgit_pageurl(ctx.repo->url, "commit", tmp);
@@ -44,5 +46,6 @@ void print_commit(struct commit *commit)
 	cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
 	html_link_close();
-	html("</td><td>");
+	htmlf("</td><td%s>",
+		ctx.qry.showmsg ? " class='logsubject'" : "");
 	cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head,
 			 sha1_to_hex(commit->object.sha1));
@@ -62,4 +65,15 @@ void print_commit(struct commit *commit)
 	}
 	html("</td></tr>\n");
+	if (ctx.qry.showmsg) {
+		if (ctx.repo->enable_log_filecount) {
+			cols++;
+			if (ctx.repo->enable_log_linecount)
+				cols++;
+		}
+		htmlf("<tr class='nohover'><td/><td colspan='%d' class='logmsg'>",
+			cols);
+		html_txt(info->msg);
+		html("</td></tr>\n");
+	}
 	cgit_free_commitinfo(info);
 }
@@ -114,6 +128,13 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
 
 	html("<tr class='nohover'><th class='left'>Age</th>"
-	     "<th class='left'>Commit message</th>"
-	     "<th class='left'>Author</th>");
+	      "<th class='left'>Commit message");
+	if (pager) {
+		html(" (");
+		cgit_log_link("toggle", NULL, NULL, ctx.qry.head, ctx.qry.sha1,
+			      ctx.qry.path, ctx.qry.ofs, ctx.qry.grep,
+			      ctx.qry.search, ctx.qry.showmsg ? 0 : 1);
+		html(")");
+	}
+	html("</th><th class='left'>Author</th>");
 	if (ctx.repo->enable_log_filecount) {
 		html("<th class='left'>Files</th>");
@@ -150,5 +171,5 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
 				      ctx.qry.sha1, ctx.qry.path,
 				      ofs - cnt, ctx.qry.grep,
-				      ctx.qry.search);
+				      ctx.qry.search, ctx.qry.showmsg);
 			html("&nbsp;");
 		}
@@ -157,5 +178,5 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
 				      ctx.qry.sha1, ctx.qry.path,
 				      ofs + cnt, ctx.qry.grep,
-				      ctx.qry.search);
+				      ctx.qry.search, ctx.qry.showmsg);
 		}
 		html("</div>");
@@ -163,5 +184,5 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
 		html("<tr class='nohover'><td colspan='3'>");
 		cgit_log_link("[...]", NULL, NULL, ctx.qry.head, NULL, NULL, 0,
-			      NULL, NULL);
+			      NULL, NULL, ctx.qry.showmsg);
 		html("</td></tr>\n");
 	}
diff --git a/ui-refs.c b/ui-refs.c
index 0805fc8..d61ee7c 100644
--- a/ui-refs.c
+++ b/ui-refs.c
@@ -59,5 +59,6 @@ static int print_branch(struct refinfo *ref)
 		return 1;
 	html("<tr><td>");
-	cgit_log_link(name, NULL, NULL, name, NULL, NULL, 0, NULL, NULL);
+	cgit_log_link(name, NULL, NULL, name, NULL, NULL, 0, NULL, NULL,
+		      ctx.qry.showmsg);
 	html("</td><td>");
 
diff --git a/ui-repolist.c b/ui-repolist.c
index 87196f0..2c13d50 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -258,5 +258,5 @@ void cgit_print_repolist()
 			cgit_summary_link("summary", NULL, "button", NULL);
 			cgit_log_link("log", NULL, "button", NULL, NULL, NULL,
-				      0, NULL, NULL);
+				      0, NULL, NULL, ctx.qry.showmsg);
 			cgit_tree_link("tree", NULL, "button", NULL, NULL, NULL);
 			html("</td>");
diff --git a/ui-shared.c b/ui-shared.c
index 9319881..95dfeb4 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -282,5 +282,6 @@ void cgit_plain_link(char *name, char *title, char *class, char *head,
 
 void cgit_log_link(char *name, char *title, char *class, char *head,
-		   char *rev, char *path, int ofs, char *grep, char *pattern)
+		   char *rev, char *path, int ofs, char *grep, char *pattern,
+		   int showmsg)
 {
 	char *delim;
@@ -306,4 +307,9 @@ void cgit_log_link(char *name, char *title, char *class, char *head,
 		html("ofs=");
 		htmlf("%d", ofs);
+		delim = "&";
+	}
+	if (showmsg) {
+		html(delim);
+		html("showmsg=1");
 	}
 	html("'>");
@@ -571,4 +577,6 @@ void add_hidden_formfields(int incl_head, int incl_search, char *page)
 	if (ctx.qry.sha2)
 		html_hidden("id2", ctx.qry.sha2);
+	if (ctx.qry.showmsg)
+		html_hidden("showmsg", "1");
 
 	if (incl_search) {
@@ -637,5 +645,5 @@ void cgit_print_pageheader(struct cgit_context *ctx)
 			       ctx->qry.sha1, NULL);
 		cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head,
-			      NULL, NULL, 0, NULL, NULL);
+			      NULL, NULL, 0, NULL, NULL, ctx->qry.showmsg);
 		cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head,
 			       ctx->qry.sha1, NULL);
diff --git a/ui-shared.h b/ui-shared.h
index 3c8a6d0..2ab53ae 100644
--- a/ui-shared.h
+++ b/ui-shared.h
@@ -20,5 +20,5 @@ extern void cgit_plain_link(char *name, char *title, char *class, char *head,
 extern void cgit_log_link(char *name, char *title, char *class, char *head,
 			  char *rev, char *path, int ofs, char *grep,
-			  char *pattern);
+			  char *pattern, int showmsg);
 extern void cgit_commit_link(char *name, char *title, char *class, char *head,
 			     char *rev);
diff --git a/ui-tree.c b/ui-tree.c
index 79332fc..051db7c 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -107,5 +107,5 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
 	html("<td>");
 	cgit_log_link("log", NULL, "button", ctx.qry.head, curr_rev,
-		      fullpath, 0, NULL, NULL);
+		      fullpath, 0, NULL, NULL, ctx.qry.showmsg);
 	html("</td></tr>\n");
 	free(name);