filter: allow returning exit code from filter

[cgit.git] / ui-commit.c

diff --git a/ui-commit.c b/ui-commit.c
index a11bc5f3b00d21368c3ba826e7060aeb14de83d7..c48bfe88fb7966c763e36a37d2a654a776e517d3 100644 (file)
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -1,12 +1,13 @@
 /* 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"
@@ -17,6 +18,7 @@ void cgit_print_commit(char *hex, const char *prefix)
        struct commit *commit, *parent;
        struct commitinfo *info, *parent_info;
        struct commit_list *p;
+       struct strbuf notes = STRBUF_INIT;
        unsigned char sha1[20];
        char *tmp, *tmp2;
        int parents = 0;
@@ -25,34 +27,41 @@ void cgit_print_commit(char *hex, const char *prefix)
                hex = ctx.qry.head;
 
        if (get_sha1(hex, sha1)) {
-               cgit_print_error(fmt("Bad object id: %s", hex));
+               cgit_print_error("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("Bad commit reference: %s", hex);
                return;
        }
        info = cgit_parse_commit(commit);
 
+       format_display_notes(sha1, &notes, PAGE_ENCODING, 0);
+
        load_ref_decorations(DECORATE_FULL_REFS);
 
+       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("</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("</td></tr>\n");
@@ -61,11 +70,6 @@ void cgit_print_commit(char *hex, const char *prefix)
        cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp, prefix, 0);
        html(" (");
        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);
@@ -75,8 +79,9 @@ void cgit_print_commit(char *hex, const char *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) {
+       for (p = commit->parents; p; p = p->next) {
                parent = lookup_commit_reference(p->item->object.sha1);
                if (!parent) {
                        html("<tr><td colspan='3'>");
@@ -106,26 +111,32 @@ void cgit_print_commit(char *hex, const char *prefix)
        }
        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);
                else
                        tmp = NULL;
-               cgit_print_diff(ctx.qry.sha1, tmp, prefix);
+               cgit_print_diff(ctx.qry.sha1, tmp, prefix, 0, 0);
        }
+       strbuf_release(&notes);
        cgit_free_commitinfo(info);
 }