Merge branch 'rt/plain-binary'

[ps-cgit] / ui-commit.c

diff --git a/ui-commit.c b/ui-commit.c
index 1aa5d3415947cd4b9a12c79ca4695e62a6723bfb..41ce70e2a9964839b5bf8f03ba6698b7d1ac69d1 100644 (file)
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -10,6 +10,7 @@
 #include "html.h"
 #include "ui-shared.h"
 #include "ui-diff.h"
+#include "ui-log.h"
 
 void cgit_print_commit(char *hex)
 {
@@ -18,6 +19,7 @@ void cgit_print_commit(char *hex)
        struct commit_list *p;
        unsigned char sha1[20];
        char *tmp;
+       int parents = 0;
 
        if (!hex)
                hex = ctx.qry.head;
@@ -33,20 +35,22 @@ void cgit_print_commit(char *hex)
        }
        info = cgit_parse_commit(commit);
 
+       load_ref_decorations();
+
        html("<table summary='commit info' class='commit-info'>\n");
        html("<tr><th>author</th><td>");
        html_txt(info->author);
        html(" ");
        html_txt(info->author_email);
        html("</td><td class='right'>");
-       cgit_print_date(info->author_date, FMT_LONGDATE);
+       cgit_print_date(info->author_date, FMT_LONGDATE, ctx.cfg.local_time);
        html("</td></tr>\n");
        html("<tr><th>committer</th><td>");
        html_txt(info->committer);
        html(" ");
        html_txt(info->committer_email);
        html("</td><td class='right'>");
-       cgit_print_date(info->committer_date, FMT_LONGDATE);
+       cgit_print_date(info->committer_date, FMT_LONGDATE, ctx.cfg.local_time);
        html("</td></tr>\n");
        html("<tr><th>commit</th><td colspan='2' class='sha1'>");
        tmp = sha1_to_hex(commit->object.sha1);
@@ -75,6 +79,7 @@ void cgit_print_commit(char *hex)
                cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex,
                               sha1_to_hex(p->item->object.sha1), NULL);
                html(")</td></tr>");
+               parents++;
        }
        if (ctx.repo->snapshots) {
                html("<tr><th>download</th><td colspan='2' class='sha1'>");
@@ -85,13 +90,16 @@ void cgit_print_commit(char *hex)
        html("</table>\n");
        html("<div class='commit-subject'>");
        html_txt(info->subject);
+       show_commit_decorations(commit);
        html("</div>");
        html("<div class='commit-msg'>");
        html_txt(info->msg);
        html("</div>");
-       if (!(commit->parents && commit->parents->next &&
-             commit->parents->next->next)) {
-               tmp = sha1_to_hex(commit->parents->item->object.sha1);
+       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_free_commitinfo(info);