clone: use cgit_print_error_page() instead of html_status()

[ps-cgit] / ui-patch.c

diff --git a/ui-patch.c b/ui-patch.c
index 3086608539dd04ed6719950d1686be416cd45bf8..57ca2f8ca7710df8cbea9b3bab09ff576f8a1d7d 100644 (file)
--- a/ui-patch.c
+++ b/ui-patch.c
@@ -25,21 +25,25 @@ void cgit_print_patch(const char *new_rev, const char *old_rev,
                new_rev = ctx.qry.head;
 
        if (get_sha1(new_rev, new_rev_sha1)) {
                new_rev = ctx.qry.head;
 
        if (get_sha1(new_rev, new_rev_sha1)) {

+               cgit_print_http_headers();

                cgit_print_error("Bad object id: %s", new_rev);
                return;
        }
        commit = lookup_commit_reference(new_rev_sha1);
        if (!commit) {
                cgit_print_error("Bad object id: %s", new_rev);
                return;
        }
        commit = lookup_commit_reference(new_rev_sha1);
        if (!commit) {

+               cgit_print_http_headers();

                cgit_print_error("Bad commit reference: %s", new_rev);
                return;
        }
 
        if (old_rev) {
                if (get_sha1(old_rev, old_rev_sha1)) {
                cgit_print_error("Bad commit reference: %s", new_rev);
                return;
        }
 
        if (old_rev) {
                if (get_sha1(old_rev, old_rev_sha1)) {

+                       cgit_print_http_headers();

                        cgit_print_error("Bad object id: %s", old_rev);
                        return;
                }
                if (!lookup_commit_reference(old_rev_sha1)) {
                        cgit_print_error("Bad object id: %s", old_rev);
                        return;
                }
                if (!lookup_commit_reference(old_rev_sha1)) {

+                       cgit_print_http_headers();

                        cgit_print_error("Bad commit reference: %s", old_rev);
                        return;
                }
                        cgit_print_error("Bad commit reference: %s", old_rev);
                        return;
                }


@@ -59,7 +63,7 @@ void cgit_print_patch(const char *new_rev, const char *old_rev,
        patchname = fmt("%s.patch", rev_range);
        ctx.page.mimetype = "text/plain";
        ctx.page.filename = patchname;
        patchname = fmt("%s.patch", rev_range);
        ctx.page.mimetype = "text/plain";
        ctx.page.filename = patchname;

-       cgit_print_http_headers(&ctx);
+       cgit_print_http_headers();

 
        if (ctx.cfg.noplainemail) {
                rev_argv[2] = "--format=format:From %H Mon Sep 17 00:00:00 "
 
        if (ctx.cfg.noplainemail) {
                rev_argv[2] = "--format=format:From %H Mon Sep 17 00:00:00 "


@@ -73,7 +77,8 @@ void cgit_print_patch(const char *new_rev, const char *old_rev,
        rev.diff = 1;
        rev.show_root_diff = 1;
        rev.max_parents = 1;
        rev.diff = 1;
        rev.show_root_diff = 1;
        rev.max_parents = 1;

-       rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
+       rev.diffopt.output_format |= DIFF_FORMAT_DIFFSTAT |
+                       DIFF_FORMAT_PATCH | DIFF_FORMAT_SUMMARY;

        setup_revisions(ARRAY_SIZE(rev_argv), (const char **)rev_argv, &rev,
                        NULL);
        prepare_revision_walk(&rev);
        setup_revisions(ARRAY_SIZE(rev_argv), (const char **)rev_argv, &rev,
                        NULL);
        prepare_revision_walk(&rev);


@@ -82,4 +87,6 @@ void cgit_print_patch(const char *new_rev, const char *old_rev,
                log_tree_commit(&rev, commit);
                printf("-- \ncgit %s\n\n", cgit_version);
        }
                log_tree_commit(&rev, commit);
                printf("-- \ncgit %s\n\n", cgit_version);
        }

+
+       fflush(stdout);

 }
 }