1 files changed, 37 insertions, 9 deletions

diff --git a/ui-commit.c b/ui-commit.c
index f5b0ae5..2b4f677 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -14,9 +14,10 @@
 
-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;
@@ -37,2 +38,4 @@ void cgit_print_commit(char *hex)
 
+        format_note(NULL, sha1, &notes, PAGE_ENCODING, 0);
+
         load_ref_decorations(DECORATE_FULL_REFS);
@@ -60,5 +63,10 @@ void cgit_print_commit(char *hex)
         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(") (");
+        if ((ctx.qry.ssdiff && !ctx.cfg.ssdiff) || (!ctx.qry.ssdiff && ctx.cfg.ssdiff))
+                cgit_commit_link("unidiff", NULL, NULL, ctx.qry.head, tmp, prefix, 1);
+        else
+                cgit_commit_link("side-by-side diff", NULL, NULL, ctx.qry.head, tmp, prefix, 1);
         html(")</td></tr>\n");
@@ -68,2 +76,6 @@ void cgit_print_commit(char *hex)
                        ctx.qry.head, tmp, NULL);
+        if (prefix) {
+                html(" /");
+                cgit_tree_link(prefix, NULL, NULL, ctx.qry.head, tmp, prefix);
+        }
         html("</td></tr>\n");
@@ -79,7 +91,11 @@ void cgit_print_commit(char *hex)
                      "<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>");
@@ -109,2 +125,13 @@ void cgit_print_commit(char *hex)
         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) {
@@ -114,4 +141,5 @@ void cgit_print_commit(char *hex)
                         tmp = NULL;
-                cgit_print_diff(ctx.qry.sha1, tmp, NULL);
+                cgit_print_diff(ctx.qry.sha1, tmp, prefix);
         }
+        strbuf_release(&notes);
         cgit_free_commitinfo(info);