Merge branch 'stable'

[cgit.git] / ui-commit.c

diff --git a/ui-commit.c b/ui-commit.c
index a11bc5f3b00d21368c3ba826e7060aeb14de83d7..2b4f677832e2aa0e85e305f3ee5ada1f7de07e2c 100644 (file)
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -17,6 +17,7 @@ void cgit_print_commit(char *hex, const char *prefix)
        struct commit *commit, *parent;
        struct commitinfo *info, *parent_info;
        struct commit_list *p;
        struct commit *commit, *parent;
        struct commitinfo *info, *parent_info;
        struct commit_list *p;

+       struct strbuf notes = STRBUF_INIT;

        unsigned char sha1[20];
        char *tmp, *tmp2;
        int parents = 0;
        unsigned char sha1[20];
        char *tmp, *tmp2;
        int parents = 0;


@@ -35,6 +36,8 @@ void cgit_print_commit(char *hex, const char *prefix)
        }
        info = cgit_parse_commit(commit);
 
        }
        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");
        load_ref_decorations(DECORATE_FULL_REFS);
 
        html("<table summary='commit info' class='commit-info'>\n");


@@ -120,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 (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);
        if (parents < 3) {
                if (parents)
                        tmp = sha1_to_hex(commit->parents->item->object.sha1);


@@ -127,5 +141,6 @@ void cgit_print_commit(char *hex, const char *prefix)
                        tmp = NULL;
                cgit_print_diff(ctx.qry.sha1, tmp, prefix);
        }
                        tmp = NULL;
                cgit_print_diff(ctx.qry.sha1, tmp, prefix);
        }

+       strbuf_release(&notes);

        cgit_free_commitinfo(info);
 }
        cgit_free_commitinfo(info);
 }