ui-shared: redirect should not exit early for cache

[cgit.git] / ui-commit.c

diff --git a/ui-commit.c b/ui-commit.c
index d6b73eed90aaf5ee232e89f5a1655c94db392577..099d294fa8fba261168cdc3091ebda97d6f97ab7 100644 (file)
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -1,74 +1,93 @@
 /* ui-commit.c: generate commit view
  *
- * Copyright (C) 2006 Lars Hjemli
+ * Copyright (C) 2006-2014 cgit Development Team <cgit@lists.zx2c4.com>
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
+#include "ui-commit.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, 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;
 
        if (!hex)
                hex = ctx.qry.head;
 
        if (get_sha1(hex, sha1)) {
-               cgit_print_error(fmt("Bad object id: %s", hex));
+               cgit_print_error_page(400, "Bad request",
+                               "Bad object id: %s", hex);
                return;
        }
        commit = lookup_commit_reference(sha1);
        if (!commit) {
-               cgit_print_error(fmt("Bad commit reference: %s", hex));
+               cgit_print_error_page(404, "Not found",
+                               "Bad commit reference: %s", hex);
                return;
        }
        info = cgit_parse_commit(commit);
 
-       load_ref_decorations();
+       format_display_notes(sha1, &notes, PAGE_ENCODING, 0);
 
+       load_ref_decorations(DECORATE_FULL_REFS);
+
+       cgit_print_layout_start();
+       cgit_print_diff_ctrls();
        html("<table summary='commit info' class='commit-info'>\n");
        html("<tr><th>author</th><td>");
+       cgit_open_filter(ctx.repo->email_filter, info->author_email, "commit");
        html_txt(info->author);
        if (!ctx.cfg.noplainemail) {
                html(" ");
                html_txt(info->author_email);
        }
+       cgit_close_filter(ctx.repo->email_filter);
        html("</td><td class='right'>");
-       cgit_print_date(info->author_date, FMT_LONGDATE, ctx.cfg.local_time);
+       html_txt(show_date(info->author_date, info->author_tz,
+                               cgit_date_mode(DATE_ISO8601)));
        html("</td></tr>\n");
        html("<tr><th>committer</th><td>");
+       cgit_open_filter(ctx.repo->email_filter, info->committer_email, "commit");
        html_txt(info->committer);
        if (!ctx.cfg.noplainemail) {
                html(" ");
                html_txt(info->committer_email);
        }
+       cgit_close_filter(ctx.repo->email_filter);
        html("</td><td class='right'>");
-       cgit_print_date(info->committer_date, FMT_LONGDATE, ctx.cfg.local_time);
+       html_txt(show_date(info->committer_date, info->committer_tz,
+                               cgit_date_mode(DATE_ISO8601)));
        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);
+       tmp = oid_to_hex(&commit->object.oid);
+       cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp, prefix);
        html(" (");
-       cgit_patch_link("patch", NULL, NULL, NULL, tmp);
+       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,
+       cgit_tree_link(oid_to_hex(&commit->tree->object.oid), NULL, NULL,
                       ctx.qry.head, tmp, NULL);
+       if (prefix) {
+               html(" /");
+               cgit_tree_link(prefix, NULL, NULL, ctx.qry.head, tmp, prefix);
+       }
+       free(tmp);
        html("</td></tr>\n");
-       for (p = commit->parents; p ; p = p->next) {
-               parent = lookup_commit_reference(p->item->object.sha1);
+       for (p = commit->parents; p; p = p->next) {
+               parent = lookup_commit_reference(p->item->object.oid.hash);
                if (!parent) {
                        html("<tr><td colspan='3'>");
                        cgit_print_error("Error reading parent commit");
@@ -77,11 +96,15 @@ 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 = oid_to_hex(&p->item->object.oid);
+               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);
                html(" (");
                cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex,
-                              sha1_to_hex(p->item->object.sha1), NULL);
+                              oid_to_hex(&p->item->object.oid), prefix);
                html(")</td></tr>");
                parents++;
        }
@@ -93,26 +116,33 @@ 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);
+       cgit_open_filter(ctx.repo->commit_filter);
        html_txt(info->subject);
-       if (ctx.repo->commit_filter)
-               cgit_close_filter(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);
+       cgit_open_filter(ctx.repo->commit_filter);
        html_txt(info->msg);
-       if (ctx.repo->commit_filter)
-               cgit_close_filter(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'>");
+               cgit_open_filter(ctx.repo->commit_filter);
+               html_txt(notes.buf);
+               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);
+                       tmp = oid_to_hex(&commit->parents->item->object.oid);
                else
                        tmp = NULL;
-               cgit_print_diff(ctx.qry.sha1, tmp, NULL);
+               cgit_print_diff(ctx.qry.sha1, tmp, prefix, 0, 0);
        }
+       strbuf_release(&notes);
        cgit_free_commitinfo(info);
+       cgit_print_layout_end();
 }