Fix several whitespace errors

[cgit.git] / ui-commit.c

diff --git a/ui-commit.c b/ui-commit.c
index 41313b9d7d08fb6b5fa17f4d3bfa73db04ba50e2..74f37c8a0ff4222c13e410635fc0fac3d0ba9049 100644 (file)
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -12,11 +12,12 @@
 #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, *parent_info;
        struct commit_list *p;
+       struct strbuf notes = STRBUF_INIT;
        unsigned char sha1[20];
        char *tmp, *tmp2;
        int parents = 0;
@@ -35,8 +36,11 @@ void cgit_print_commit(char *hex)
        }
        info = cgit_parse_commit(commit);
 
+       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,21 +62,20 @@ 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, 0);
+       cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp, prefix, 0);
        html(" (");
-       cgit_patch_link("patch", NULL, NULL, NULL, tmp);
-       html(") (");
-       if ((ctx.qry.ssdiff && !ctx.cfg.ssdiff) || (!ctx.qry.ssdiff && ctx.cfg.ssdiff))
-               cgit_commit_link("unidiff", NULL, NULL, ctx.qry.head, tmp, 1);
-       else
-               cgit_commit_link("side-by-side diff", NULL, NULL, ctx.qry.head, tmp, 1);
+       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) {
+       for (p = commit->parents; p; p = p->next) {
                parent = lookup_commit_reference(p->item->object.sha1);
                if (!parent) {
                        html("<tr><td colspan='3'>");
@@ -87,10 +90,10 @@ void cgit_print_commit(char *hex)
                        parent_info = cgit_parse_commit(parent);
                        tmp2 = parent_info->subject;
                }
-               cgit_commit_link(tmp2, NULL, NULL, ctx.qry.head, tmp, 0);
+               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, 0);
+                              sha1_to_hex(p->item->object.sha1), prefix, 0);
                html(")</td></tr>");
                parents++;
        }
@@ -116,12 +119,24 @@ void cgit_print_commit(char *hex)
        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);
                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);
 }