filter: allow returning exit code from filter

[cgit.git] / ui-commit.c

diff --git a/ui-commit.c b/ui-commit.c
index 8310ce6667ae288baeed9a1ca201367395ada705..c48bfe88fb7966c763e36a37d2a654a776e517d3 100644 (file)
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -1,6 +1,6 @@
 /* ui-commit.c: generate commit view
  *
 /* 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)
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)


@@ -27,17 +27,16 @@ void cgit_print_commit(char *hex, const char *prefix)
                hex = ctx.qry.head;
 
        if (get_sha1(hex, sha1)) {
                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) {
                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);
 
                return;
        }
        info = cgit_parse_commit(commit);
 

-       init_display_notes(NULL);

        format_display_notes(sha1, &notes, PAGE_ENCODING, 0);
 
        load_ref_decorations(DECORATE_FULL_REFS);
        format_display_notes(sha1, &notes, PAGE_ENCODING, 0);
 
        load_ref_decorations(DECORATE_FULL_REFS);


@@ -45,20 +44,24 @@ void cgit_print_commit(char *hex, const char *prefix)
        cgit_print_diff_ctrls();
        html("<table summary='commit info' class='commit-info'>\n");
        html("<tr><th>author</th><td>");
        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);
        }
        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>");
        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);
        }
        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");
        html("</td><td class='right'>");
        cgit_print_date(info->committer_date, FMT_LONGDATE, ctx.cfg.local_time);
        html("</td></tr>\n");


@@ -108,28 +111,22 @@ void cgit_print_commit(char *hex, const char *prefix)
        }
        html("</table>\n");
        html("<div class='commit-subject'>");
        }
        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);
        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'>");
        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);
        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'>");
        html("</div>");
        if (notes.len != 0) {
                html("<div class='notes-header'>Notes</div>");
                html("<div class='notes'>");

-               if (ctx.repo->commit_filter)
-                       cgit_open_filter(ctx.repo->commit_filter);
+               cgit_open_filter(ctx.repo->commit_filter);

                html_txt(notes.buf);
                html_txt(notes.buf);

-               if (ctx.repo->commit_filter)
-                       cgit_close_filter(ctx.repo->commit_filter);
+               cgit_close_filter(ctx.repo->commit_filter);

                html("</div>");
                html("<div class='notes-footer'></div>");
        }
                html("</div>");
                html("<div class='notes-footer'></div>");
        }


@@ -138,7 +135,7 @@ void cgit_print_commit(char *hex, const char *prefix)
                        tmp = sha1_to_hex(commit->parents->item->object.sha1);
                else
                        tmp = NULL;
                        tmp = sha1_to_hex(commit->parents->item->object.sha1);
                else
                        tmp = NULL;

-               cgit_print_diff(ctx.qry.sha1, tmp, prefix, 0);
+               cgit_print_diff(ctx.qry.sha1, tmp, prefix, 0, 0);

        }
        strbuf_release(&notes);
        cgit_free_commitinfo(info);
        }
        strbuf_release(&notes);
        cgit_free_commitinfo(info);