Merge branch 'lh/readme'

[cgit.git] / ui-commit.c

diff --git a/ui-commit.c b/ui-commit.c
index 2d98ed9ea956cef5f71272e1473293c0c1b32338..2b4f677832e2aa0e85e305f3ee5ada1f7de07e2c 100644 (file)
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -15,10 +15,11 @@
 void cgit_print_commit(char *hex, const char *prefix)
 {
        struct commit *commit, *parent;
-       struct commitinfo *info;
+       struct commitinfo *info, *parent_info;
        struct commit_list *p;
+       struct strbuf notes = STRBUF_INIT;
        unsigned char sha1[20];
-       char *tmp;
+       char *tmp, *tmp2;
        int parents = 0;
 
        if (!hex)
@@ -35,6 +36,8 @@ void cgit_print_commit(char *hex, const char *prefix)
        }
        info = cgit_parse_commit(commit);
 
+       format_note(NULL, sha1, &notes, PAGE_ENCODING, 0);
+
        load_ref_decorations(DECORATE_FULL_REFS);
 
        html("<table summary='commit info' class='commit-info'>\n");
@@ -86,9 +89,12 @@ void cgit_print_commit(char *hex, const char *prefix)
                }
                html("<tr><th>parent</th>"
                     "<td colspan='2' class='sha1'>");
-               cgit_commit_link(sha1_to_hex(p->item->object.sha1), NULL, NULL,
-                                ctx.qry.head,
-                                sha1_to_hex(p->item->object.sha1), prefix, 0);
+               tmp = tmp2 = sha1_to_hex(p->item->object.sha1);
+               if (ctx.repo->enable_subject_links) {
+                       parent_info = cgit_parse_commit(parent);
+                       tmp2 = parent_info->subject;
+               }
+               cgit_commit_link(tmp2, NULL, NULL, ctx.qry.head, tmp, prefix, 0);
                html(" (");
                cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex,
                               sha1_to_hex(p->item->object.sha1), prefix, 0);
@@ -117,6 +123,17 @@ void cgit_print_commit(char *hex, const char *prefix)
        if (ctx.repo->commit_filter)
                cgit_close_filter(ctx.repo->commit_filter);
        html("</div>");
+       if (notes.len != 0) {
+               html("<div class='notes-header'>Notes</div>");
+               html("<div class='notes'>");
+               if (ctx.repo->commit_filter)
+                       cgit_open_filter(ctx.repo->commit_filter);
+               html_txt(notes.buf);
+               if (ctx.repo->commit_filter)
+                       cgit_close_filter(ctx.repo->commit_filter);
+               html("</div>");
+               html("<div class='notes-footer'></div>");
+       }
        if (parents < 3) {
                if (parents)
                        tmp = sha1_to_hex(commit->parents->item->object.sha1);
@@ -124,5 +141,6 @@ void cgit_print_commit(char *hex, const char *prefix)
                        tmp = NULL;
                cgit_print_diff(ctx.qry.sha1, tmp, prefix);
        }
+       strbuf_release(&notes);
        cgit_free_commitinfo(info);
 }