Merge branch 'stable'

[ps-cgit] / ui-log.c

diff --git a/ui-log.c b/ui-log.c
index ee93653384695d7337b3947c9c59505800ec853a..41b5225616933bcc7ab80a155ef0f7ba6c65b4cd 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) {
        }
        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.repo->enable_log_filecount) {
                        cols++;
                        if (ctx.repo->enable_log_linecount)
                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");
                        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);
 }
        }
        cgit_free_commitinfo(info);
 }


@@ -216,8 +228,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
                commit->parents = NULL;
        }
        if (pager) {
                commit->parents = NULL;
        }
        if (pager) {

-               htmlf("</table><div class='pager'>",
-                    columns);
+               html("</table><div class='pager'>");

                if (ofs > 0) {
                        cgit_log_link("[prev]", NULL, NULL, ctx.qry.head,
                                      ctx.qry.sha1, ctx.qry.vpath,
                if (ofs > 0) {
                        cgit_log_link("[prev]", NULL, NULL, ctx.qry.head,
                                      ctx.qry.sha1, ctx.qry.vpath,