syntax-highlighting: always use utf-8 to avoid ascii codec issues

[cgit.git] / ui-diff.c

diff --git a/ui-diff.c b/ui-diff.c
index caebd5d9eea61053cdcf8c85672acd506a9e0b52..52ed9426747088c21cd0de74b0f8efe58aceb073 100644 (file)
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -403,23 +403,26 @@ void cgit_print_diff(const char *new_rev, const char *old_rev,
        if (!new_rev)
                new_rev = ctx.qry.head;
        if (get_sha1(new_rev, new_rev_sha1)) {
-               cgit_print_error("Bad object name: %s", new_rev);
+               cgit_print_error_page(404, "Not found",
+                       "Bad object name: %s", new_rev);
                return;
        }
        commit = lookup_commit_reference(new_rev_sha1);
        if (!commit || parse_commit(commit)) {
-               cgit_print_error("Bad commit: %s", sha1_to_hex(new_rev_sha1));
+               cgit_print_error_page(404, "Not found",
+                       "Bad commit: %s", sha1_to_hex(new_rev_sha1));
                return;
        }
-       new_tree_sha1 = commit->tree->object.sha1;
+       new_tree_sha1 = commit->tree->object.oid.hash;
 
        if (old_rev) {
                if (get_sha1(old_rev, old_rev_sha1)) {
-                       cgit_print_error("Bad object name: %s", old_rev);
+                       cgit_print_error_page(404, "Not found",
+                               "Bad object name: %s", old_rev);
                        return;
                }
        } else if (commit->parents && commit->parents->item) {
-               hashcpy(old_rev_sha1, commit->parents->item->object.sha1);
+               hashcpy(old_rev_sha1, commit->parents->item->object.oid.hash);
        } else {
                hashclr(old_rev_sha1);
        }
@@ -427,10 +430,11 @@ void cgit_print_diff(const char *new_rev, const char *old_rev,
        if (!is_null_sha1(old_rev_sha1)) {
                commit2 = lookup_commit_reference(old_rev_sha1);
                if (!commit2 || parse_commit(commit2)) {
-                       cgit_print_error("Bad commit: %s", sha1_to_hex(old_rev_sha1));
+                       cgit_print_error_page(404, "Not found",
+                               "Bad commit: %s", sha1_to_hex(old_rev_sha1));
                        return;
                }
-               old_tree_sha1 = commit2->tree->object.sha1;
+               old_tree_sha1 = commit2->tree->object.oid.hash;
        } else {
                old_tree_sha1 = NULL;
        }
@@ -460,8 +464,10 @@ void cgit_print_diff(const char *new_rev, const char *old_rev,
        difftype = ctx.qry.has_difftype ? ctx.qry.difftype : ctx.cfg.difftype;
        use_ssdiff = difftype == DIFF_SSDIFF;
 
-       if (show_ctrls)
+       if (show_ctrls) {
+               cgit_print_layout_start();
                cgit_print_diff_ctrls();
+       }
 
        /*
         * Clicking on a link to a file in the diff stat should show a diff
@@ -489,4 +495,7 @@ void cgit_print_diff(const char *new_rev, const char *old_rev,
        if (!use_ssdiff)
                html("</td></tr>");
        html("</table>");
+
+       if (show_ctrls)
+               cgit_print_layout_end();
 }