commit: move layout into page function

[ps-cgit] / ui-commit.c

diff --git a/ui-commit.c b/ui-commit.c
index c48bfe88fb7966c763e36a37d2a654a776e517d3..2bca7a019ea67a9e0c63f2578ed9ff076dd6d5bd 100644 (file)
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -27,12 +27,14 @@ void cgit_print_commit(char *hex, const char *prefix)
                hex = ctx.qry.head;
 
        if (get_sha1(hex, sha1)) {
-               cgit_print_error("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("Bad commit reference: %s", hex);
+               cgit_print_error_page(404, "Not found",
+                               "Bad commit reference: %s", hex);
                return;
        }
        info = cgit_parse_commit(commit);
@@ -41,6 +43,7 @@ void cgit_print_commit(char *hex, const char *prefix)
 
        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>");
@@ -67,7 +70,7 @@ void cgit_print_commit(char *hex, const char *prefix)
        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, prefix, 0);
+       cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp, prefix);
        html(" (");
        cgit_patch_link("patch", NULL, NULL, NULL, tmp, prefix);
        html(")</td></tr>\n");
@@ -96,10 +99,10 @@ void cgit_print_commit(char *hex, const char *prefix)
                        parent_info = cgit_parse_commit(parent);
                        tmp2 = parent_info->subject;
                }
-               cgit_commit_link(tmp2, NULL, NULL, ctx.qry.head, tmp, prefix, 0);
+               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), prefix, 0);
+                              sha1_to_hex(p->item->object.sha1), prefix);
                html(")</td></tr>");
                parents++;
        }
@@ -139,4 +142,5 @@ void cgit_print_commit(char *hex, const char *prefix)
        }
        strbuf_release(&notes);
        cgit_free_commitinfo(info);
+       cgit_print_layout_end();
 }