filter: return on null filter from open and close

[cgit.git] / ui-patch.c

diff --git a/ui-patch.c b/ui-patch.c
index 72c9749831bf167f1ad38330b8f04058dcc141bd..3086608539dd04ed6719950d1686be416cd45bf8 100644 (file)
--- a/ui-patch.c
+++ b/ui-patch.c
@@ -1,6 +1,6 @@
 /* ui-patch.c: generate patch view
  *
- * Copyright (C) 2007 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)
@@ -11,38 +11,52 @@
 #include "html.h"
 #include "ui-shared.h"
 
-void cgit_print_patch(char *hex, const char *prefix)
+void cgit_print_patch(const char *new_rev, const char *old_rev,
+                     const char *prefix)
 {
        struct rev_info rev;
        struct commit *commit;
-       unsigned char sha1[20], old_sha1[20];
+       unsigned char new_rev_sha1[20], old_rev_sha1[20];
        char rev_range[2 * 40 + 3];
        char *rev_argv[] = { NULL, "--reverse", "--format=email", rev_range };
        char *patchname;
 
-       if (!hex)
-               hex = ctx.qry.head;
+       if (!new_rev)
+               new_rev = ctx.qry.head;
 
-       if (get_sha1(hex, sha1)) {
-               cgit_print_error("Bad object id: %s", hex);
+       if (get_sha1(new_rev, new_rev_sha1)) {
+               cgit_print_error("Bad object id: %s", new_rev);
                return;
        }
-       commit = lookup_commit_reference(sha1);
+       commit = lookup_commit_reference(new_rev_sha1);
        if (!commit) {
-               cgit_print_error("Bad commit reference: %s", hex);
+               cgit_print_error("Bad commit reference: %s", new_rev);
                return;
        }
 
-       if (commit->parents && commit->parents->item) {
-               hashcpy(old_sha1, commit->parents->item->object.sha1);
-               sprintf(rev_range, "%s..%s", sha1_to_hex(old_sha1),
-                       sha1_to_hex(sha1));
+       if (old_rev) {
+               if (get_sha1(old_rev, old_rev_sha1)) {
+                       cgit_print_error("Bad object id: %s", old_rev);
+                       return;
+               }
+               if (!lookup_commit_reference(old_rev_sha1)) {
+                       cgit_print_error("Bad commit reference: %s", old_rev);
+                       return;
+               }
+       } else if (commit->parents && commit->parents->item) {
+               hashcpy(old_rev_sha1, commit->parents->item->object.sha1);
        } else {
-               hashclr(old_sha1);
-               memcpy(rev_range, sha1_to_hex(sha1), 41);
+               hashclr(old_rev_sha1);
        }
 
-       patchname = fmt("%s.patch", sha1_to_hex(sha1));
+       if (is_null_sha1(old_rev_sha1)) {
+               memcpy(rev_range, sha1_to_hex(new_rev_sha1), 41);
+       } else {
+               sprintf(rev_range, "%s..%s", sha1_to_hex(old_rev_sha1),
+                       sha1_to_hex(new_rev_sha1));
+       }
+
+       patchname = fmt("%s.patch", rev_range);
        ctx.page.mimetype = "text/plain";
        ctx.page.filename = patchname;
        cgit_print_http_headers(&ctx);
@@ -58,6 +72,7 @@ void cgit_print_patch(char *hex, const char *prefix)
        rev.verbose_header = 1;
        rev.diff = 1;
        rev.show_root_diff = 1;
+       rev.max_parents = 1;
        rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
        setup_revisions(ARRAY_SIZE(rev_argv), (const char **)rev_argv, &rev,
                        NULL);
@@ -65,6 +80,6 @@ void cgit_print_patch(char *hex, const char *prefix)
 
        while ((commit = get_revision(&rev)) != NULL) {
                log_tree_commit(&rev, commit);
-               printf("--\ncgit %s\n", cgit_version);
+               printf("-- \ncgit %s\n\n", cgit_version);
        }
 }