Merge branch 'lh/panel'

[cgit.git] / ui-commit.c

diff --git a/ui-commit.c b/ui-commit.c
index f5b0ae553be5edfaa58a5b7fbcbef6d9a29eb776..a69dec649f05cb8035f415dc395ed6d1f312f921 100644 (file)
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -12,13 +12,14 @@
 #include "ui-diff.h"
 #include "ui-log.h"
 
-void cgit_print_commit(char *hex)
+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,8 +36,11 @@ void cgit_print_commit(char *hex)
        }
        info = cgit_parse_commit(commit);
 
-       load_ref_decorations(DECORATE_FULL_REFS);
+       format_note(NULL, sha1, &notes, PAGE_ENCODING, 0);
 
+       load_ref_decorations(DECORATE_FULL_REFS);
+       
+       cgit_print_diff_ctrls();
        html("<table summary='commit info' class='commit-info'>\n");
        html("<tr><th>author</th><td>");
        html_txt(info->author);
@@ -58,14 +62,18 @@ void cgit_print_commit(char *hex)
        html("</td></tr>\n");
        html("<tr><th>commit</th><td colspan='2' class='sha1'>");
        tmp = sha1_to_hex(commit->object.sha1);
-       cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp);
+       cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp, prefix, 0);
        html(" (");
-       cgit_patch_link("patch", NULL, NULL, NULL, tmp);
+       cgit_patch_link("patch", NULL, NULL, NULL, tmp, prefix);
        html(")</td></tr>\n");
        html("<tr><th>tree</th><td colspan='2' class='sha1'>");
        tmp = xstrdup(hex);
        cgit_tree_link(sha1_to_hex(commit->tree->object.sha1), NULL, NULL,
                       ctx.qry.head, tmp, NULL);
+       if (prefix) {
+               html(" /");
+               cgit_tree_link(prefix, NULL, NULL, ctx.qry.head, tmp, prefix);
+       }
        html("</td></tr>\n");
        for (p = commit->parents; p ; p = p->next) {
                parent = lookup_commit_reference(p->item->object.sha1);
@@ -77,11 +85,15 @@ void cgit_print_commit(char *hex)
                }
                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));
+               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), NULL);
+                              sha1_to_hex(p->item->object.sha1), prefix, 0);
                html(")</td></tr>");
                parents++;
        }
@@ -94,7 +106,7 @@ void cgit_print_commit(char *hex)
        html("</table>\n");
        html("<div class='commit-subject'>");
        if (ctx.repo->commit_filter)
-               cgit_open_filter(ctx.repo->commit_filter);
+               cgit_open_filter(ctx.repo->commit_filter, ctx.repo);
        html_txt(info->subject);
        if (ctx.repo->commit_filter)
                cgit_close_filter(ctx.repo->commit_filter);
@@ -102,17 +114,29 @@ void cgit_print_commit(char *hex)
        html("</div>");
        html("<div class='commit-msg'>");
        if (ctx.repo->commit_filter)
-               cgit_open_filter(ctx.repo->commit_filter);
+               cgit_open_filter(ctx.repo->commit_filter, ctx.repo);
        html_txt(info->msg);
        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, ctx.repo);
+               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);
                else
                        tmp = NULL;
-               cgit_print_diff(ctx.qry.sha1, tmp, NULL);
+               cgit_print_diff(ctx.qry.sha1, tmp, prefix, 0);
        }
+       strbuf_release(&notes);
        cgit_free_commitinfo(info);
 }