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
@@ -147,24 +147,26 @@ static void querystring_cb(const char *name, const char *value)
                 ctx.qry.sha2 = xstrdup(value);
                 ctx.qry.has_sha1 = 1;
         } else if (!strcmp(name, "ofs")) {
                 ctx.qry.ofs = atoi(value);
         } else if (!strcmp(name, "path")) {
                 ctx.qry.path = trim_end(value, '/');
         } else if (!strcmp(name, "name")) {
                 ctx.qry.name = xstrdup(value);
         } else if (!strcmp(name, "mimetype")) {
                 ctx.qry.mimetype = xstrdup(value);
         } else if (!strcmp(name, "s")){
                 ctx.qry.sort = xstrdup(value);
+        } else if (!strcmp(name, "showmsg")) {
+                ctx.qry.showmsg = atoi(value);
         }
 }
 
 static void prepare_context(struct cgit_context *ctx)
 {
         memset(ctx, 0, sizeof(ctx));
         ctx->cfg.agefile = "info/web/last-modified";
         ctx->cfg.nocache = 0;
         ctx->cfg.cache_size = 0;
         ctx->cfg.cache_dynamic_ttl = 5;
         ctx->cfg.cache_max_create_time = 5;
         ctx->cfg.cache_repo_ttl = 5;
diff --git a/cgit.css b/cgit.css
index a37d218..7928c2f 100644
--- a/cgit.css
+++ b/cgit.css
@@ -111,47 +111,62 @@ div.content {
 
 
 table.list {
         width: 100%;
         border: none;
         border-collapse: collapse;
 }
 
 table.list tr {
         background: white;
 }
 
+table.list tr.logheader {
+        background: #eee;
+}
+
 table.list tr:hover {
         background: #eee;
 }
 
 table.list tr.nohover:hover {
         background: white;
 }
 
 table.list th {
         font-weight: bold;
         /* color: #888;
         border-top: dashed 1px #888;
         border-bottom: dashed 1px #888;
         */
         padding: 0.1em 0.5em 0.05em 0.5em;
         vertical-align: baseline;
 }
 
 table.list td {
         border: none;
         padding: 0.1em 0.5em 0.1em 0.5em;
 }
 
+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;
 }
 
 table.list td a:hover {
         color: #00f;
 }
 
 img {
         border: none;
 }
 
diff --git a/cgit.h b/cgit.h
index f1fbeca..cb2f176 100644
--- a/cgit.h
+++ b/cgit.h
@@ -114,24 +114,25 @@ struct cgit_query {
         char *search;
         char *grep;
         char *head;
         char *sha1;
         char *sha2;
         char *path;
         char *name;
         char *mimetype;
         char *url;
         int   ofs;
         int nohead;
         char *sort;
+        int showmsg;
 };
 
 struct cgit_config {
         char *agefile;
         char *cache_root;
         char *clone_prefix;
         char *css;
         char *favicon;
         char *footer;
         char *index_header;
         char *index_info;
         char *logo;
diff --git a/ui-log.c b/ui-log.c
index d212984..2f90778 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -26,50 +26,64 @@ void count_lines(char *line, int size)
 
 void inspect_files(struct diff_filepair *pair)
 {
         files++;
         if (ctx.repo->enable_log_linecount)
                 cgit_diff_files(pair->one->sha1, pair->two->sha1, count_lines);
 }
 
 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);
         html_link_open(tmp, NULL, NULL);
         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));
         html("</td><td>");
         html_txt(info->author);
         if (ctx.repo->enable_log_filecount) {
                 files = 0;
                 add_lines = 0;
                 rem_lines = 0;
                 cgit_diff_commit(commit, inspect_files);
                 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) {
+                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);
 }
 
 static const char *disambiguate_ref(const char *ref)
 {
         unsigned char sha1[20];
         const char *longref;
 
         longref = fmt("refs/heads/%s", ref);
         if (get_sha1(longref, sha1) == 0)
                 return longref;
 
@@ -104,26 +118,33 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
         rev.commit_format = CMIT_FMT_DEFAULT;
         rev.verbose_header = 1;
         rev.show_root_diff = 0;
         setup_revisions(argc, argv, &rev, NULL);
         rev.grep_filter.regflags |= REG_ICASE;
         compile_grep_patterns(&rev.grep_filter);
         prepare_revision_walk(&rev);
 
         if (pager)
                 html("<table class='list nowrap'>");
 
         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>");
                 columns++;
                 if (ctx.repo->enable_log_linecount) {
                         html("<th class='left'>Lines</th>");
                         columns++;
                 }
         }
         html("</tr>\n");
 
         if (ofs<0)
                 ofs = 0;
@@ -140,29 +161,29 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
                 free(commit->buffer);
                 commit->buffer = NULL;
                 free_commit_list(commit->parents);
                 commit->parents = NULL;
         }
         if (pager) {
                 htmlf("</table><div class='pager'>",
                      columns);
                 if (ofs > 0) {
                         cgit_log_link("[prev]", NULL, NULL, ctx.qry.head,
                                       ctx.qry.sha1, ctx.qry.path,
                                       ofs - cnt, ctx.qry.grep,
-                                      ctx.qry.search);
+                                      ctx.qry.search, ctx.qry.showmsg);
                         html("&nbsp;");
                 }
                 if ((commit = get_revision(&rev)) != NULL) {
                         cgit_log_link("[next]", NULL, NULL, ctx.qry.head,
                                       ctx.qry.sha1, ctx.qry.path,
                                       ofs + cnt, ctx.qry.grep,
-                                      ctx.qry.search);
+                                      ctx.qry.search, ctx.qry.showmsg);
                 }
                 html("</div>");
         } else if ((commit = get_revision(&rev)) != NULL) {
                 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
@@ -49,25 +49,26 @@ static int cmp_tag_age(const void *a, const void *b)
 
         return cmp_age(r1->tag->tagger_date, r2->tag->tagger_date);
 }
 
 static int print_branch(struct refinfo *ref)
 {
         struct commitinfo *info = ref->commit;
         char *name = (char *)ref->refname;
 
         if (!info)
                 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>");
 
         if (ref->object->type == OBJ_COMMIT) {
                 cgit_commit_link(info->subject, NULL, NULL, name, NULL);
                 html("</td><td>");
                 html_txt(info->author);
                 html("</td><td colspan='2'>");
                 cgit_print_age(info->commit->date, -1, NULL);
         } else {
                 html("</td><td></td><td>");
                 cgit_object_link(ref->object);
         }
diff --git a/ui-repolist.c b/ui-repolist.c
index 87196f0..2c13d50 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -248,25 +248,25 @@ void cgit_print_repolist()
                 html_link_open(cgit_repourl(ctx.repo->url), NULL, NULL);
                 html_ntxt(ctx.cfg.max_repodesc_len, ctx.repo->desc);
                 html_link_close();
                 html("</td><td>");
                 html_txt(ctx.repo->owner);
                 html("</td><td>");
                 print_modtime(ctx.repo);
                 html("</td>");
                 if (ctx.cfg.enable_index_links) {
                         html("<td>");
                         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>");
                 }
                 html("</tr>\n");
         }
         html("</table>");
         if (!hits)
                 cgit_print_error("No repositories found");
         else if (hits > ctx.cfg.max_repo_count)
                 print_pager(hits, ctx.cfg.max_repo_count, ctx.qry.search);
         cgit_print_docend();
 }
diff --git a/ui-shared.c b/ui-shared.c
index 9319881..95dfeb4 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -272,48 +272,54 @@ void cgit_tree_link(char *name, char *title, char *class, char *head,
                     char *rev, char *path)
 {
         reporevlink("tree", name, title, class, head, rev, path);
 }
 
 void cgit_plain_link(char *name, char *title, char *class, char *head,
                      char *rev, char *path)
 {
         reporevlink("plain", name, title, class, head, rev, path);
 }
 
 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;
 
         delim = repolink(title, class, "log", head, path);
         if (rev && strcmp(rev, ctx.qry.head)) {
                 html(delim);
                 html("id=");
                 html_url_arg(rev);
                 delim = "&";
         }
         if (grep && pattern) {
                 html(delim);
                 html("qt=");
                 html_url_arg(grep);
                 delim = "&";
                 html(delim);
                 html("q=");
                 html_url_arg(pattern);
         }
         if (ofs > 0) {
                 html(delim);
                 html("ofs=");
                 htmlf("%d", ofs);
+                delim = "&";
+        }
+        if (showmsg) {
+                html(delim);
+                html("showmsg=1");
         }
         html("'>");
         html_txt(name);
         html("</a>");
 }
 
 void cgit_commit_link(char *name, char *title, char *class, char *head,
                       char *rev)
 {
         if (strlen(name) > ctx.cfg.max_msg_len && ctx.cfg.max_msg_len >= 15) {
                 name[ctx.cfg.max_msg_len] = '\0';
                 name[ctx.cfg.max_msg_len - 1] = '.';
@@ -561,24 +567,26 @@ void add_hidden_formfields(int incl_head, int incl_search, char *page)
                         url = fmt("%s/%s", url, ctx.qry.path);
                 html_hidden("url", url);
         }
 
         if (incl_head && ctx.qry.head && ctx.repo->defbranch &&
             strcmp(ctx.qry.head, ctx.repo->defbranch))
                 html_hidden("h", ctx.qry.head);
 
         if (ctx.qry.sha1)
                 html_hidden("id", ctx.qry.sha1);
         if (ctx.qry.sha2)
                 html_hidden("id2", ctx.qry.sha2);
+        if (ctx.qry.showmsg)
+                html_hidden("showmsg", "1");
 
         if (incl_search) {
                 if (ctx.qry.grep)
                         html_hidden("qt", ctx.qry.grep);
                 if (ctx.qry.search)
                         html_hidden("q", ctx.qry.search);
         }
 }
 
 char *hc(struct cgit_cmd *cmd, const char *page)
 {
         return (strcmp(cmd->name, page) ? NULL : "active");
@@ -627,25 +635,25 @@ void cgit_print_pageheader(struct cgit_context *ctx)
                 else if (ctx->cfg.index_info)
                         html_include(ctx->cfg.index_info);
         }
         html("</td></tr></table>\n");
 
         html("<table class='tabs'><tr><td>\n");
         if (ctx->repo) {
                 cgit_summary_link("summary", NULL, hc(cmd, "summary"),
                                   ctx->qry.head);
                 cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head,
                                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);
                 cgit_commit_link("commit", NULL, hc(cmd, "commit"),
                                  ctx->qry.head, ctx->qry.sha1);
                 cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head,
                                ctx->qry.sha1, ctx->qry.sha2, NULL);
                 if (ctx->repo->readme)
                         reporevlink("about", "about", NULL,
                                     hc(cmd, "about"), ctx->qry.head, NULL,
                                     NULL);
                 html("</td><td class='form'>");
                 html("<form class='right' method='get' action='");
diff --git a/ui-shared.h b/ui-shared.h
index 3c8a6d0..2ab53ae 100644
--- a/ui-shared.h
+++ b/ui-shared.h
@@ -10,25 +10,25 @@ extern char *cgit_pageurl(const char *reponame, const char *pagename,
 
 extern void cgit_index_link(char *name, char *title, char *class,
                             char *pattern, int ofs);
 extern void cgit_summary_link(char *name, char *title, char *class, char *head);
 extern void cgit_tag_link(char *name, char *title, char *class, char *head,
                           char *rev);
 extern void cgit_tree_link(char *name, char *title, char *class, char *head,
                            char *rev, char *path);
 extern void cgit_plain_link(char *name, char *title, char *class, char *head,
                             char *rev, char *path);
 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);
 extern void cgit_patch_link(char *name, char *title, char *class, char *head,
                             char *rev);
 extern void cgit_refs_link(char *name, char *title, char *class, char *head,
                            char *rev, char *path);
 extern void cgit_snapshot_link(char *name, char *title, char *class,
                                char *head, char *rev, char *archivename);
 extern void cgit_diff_link(char *name, char *title, char *class, char *head,
                            char *new_rev, char *old_rev, char *path);
 extern void cgit_object_link(struct object *obj);
 
diff --git a/ui-tree.c b/ui-tree.c
index 79332fc..051db7c 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -97,25 +97,25 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
                 html("</a>");
         } else if (S_ISDIR(mode)) {
                 cgit_tree_link(name, NULL, "ls-dir", ctx.qry.head,
                                curr_rev, fullpath);
         } else {
                 cgit_tree_link(name, NULL, "ls-blob", ctx.qry.head,
                                curr_rev, fullpath);
         }
         htmlf("</td><td class='ls-size'>%li</td>", size);
 
         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);
         return 0;
 }
 
 static void ls_head()
 {
         html("<table summary='tree listing' class='list'>\n");
         html("<tr class='nohover'>");
         html("<th class='left'>Mode</th>");
         html("<th class='left'>Name</th>");
         html("<th class='right'>Size</th>");