Merge branch 'lh/header'

[ps-cgit] / ui-commit.c

diff --git a/ui-commit.c b/ui-commit.c
index 4bbb391602771810eca26cbb00ef148b593f2893..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 "html.h"
 #include "ui-shared.h"
 #include "ui-diff.h"

+#include "ui-log.h"

 
 void cgit_print_commit(char *hex)
 {
 
 void cgit_print_commit(char *hex)
 {


@@ -34,20 +35,22 @@ void cgit_print_commit(char *hex)
        }
        info = cgit_parse_commit(commit);
 
        }
        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'>");
        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'>");
        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);
        html("</td></tr>\n");
        html("<tr><th>commit</th><td colspan='2' class='sha1'>");
        tmp = sha1_to_hex(commit->object.sha1);


@@ -87,6 +90,7 @@ void cgit_print_commit(char *hex)
        html("</table>\n");
        html("<div class='commit-subject'>");
        html_txt(info->subject);
        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>");
        html("<div class='commit-msg'>");
        html_txt(info->msg);