Merge branch 'stable'

[cgit.git] / ui-commit.c

diff --git a/ui-commit.c b/ui-commit.c
index 1aa5d3415947cd4b9a12c79ca4695e62a6723bfb..a11bc5f3b00d21368c3ba826e7060aeb14de83d7 100644 (file)
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -10,14 +10,16 @@
 #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, const char *prefix)
 {
        struct commit *commit, *parent;
-       struct commitinfo *info;
+       struct commitinfo *info, *parent_info;
        struct commit_list *p;
        unsigned char sha1[20];
-       char *tmp;
+       char *tmp, *tmp2;
+       int parents = 0;
 
        if (!hex)
                hex = ctx.qry.head;
@@ -33,31 +35,46 @@ void cgit_print_commit(char *hex)
        }
        info = cgit_parse_commit(commit);
 
+       load_ref_decorations(DECORATE_FULL_REFS);
+
        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);
+       if (!ctx.cfg.noplainemail) {
+               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);
+       if (!ctx.cfg.noplainemail) {
+               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);
-       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");
        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);
@@ -69,12 +86,17 @@ 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++;
        }
        if (ctx.repo->snapshots) {
                html("<tr><th>download</th><td colspan='2' class='sha1'>");
@@ -84,15 +106,26 @@ 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);
        html_txt(info->subject);
+       if (ctx.repo->commit_filter)
+               cgit_close_filter(ctx.repo->commit_filter);
+       show_commit_decorations(commit);
        html("</div>");
        html("<div class='commit-msg'>");
+       if (ctx.repo->commit_filter)
+               cgit_open_filter(ctx.repo->commit_filter);
        html_txt(info->msg);
+       if (ctx.repo->commit_filter)
+               cgit_close_filter(ctx.repo->commit_filter);
        html("</div>");
-       if (!(commit->parents && commit->parents->next &&
-             commit->parents->next->next)) {
-               tmp = sha1_to_hex(commit->parents->item->object.sha1);
-               cgit_print_diff(ctx.qry.sha1, tmp, NULL);
+       if (parents < 3) {
+               if (parents)
+                       tmp = sha1_to_hex(commit->parents->item->object.sha1);
+               else
+                       tmp = NULL;
+               cgit_print_diff(ctx.qry.sha1, tmp, prefix);
        }
        cgit_free_commitinfo(info);
 }