ui-ssdiff: resolve HTML5 validation errors

[cgit.git] / ui-patch.c

diff --git a/ui-patch.c b/ui-patch.c
index 72c9749831bf167f1ad38330b8f04058dcc141bd..5a964108e51e5f553536899cb6b79922e25e1288 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,41 +11,66 @@
 #include "html.h"
 #include "ui-shared.h"
 
-void cgit_print_patch(char *hex, const char *prefix)
+/* two commit hashes with two dots in between and termination */
+#define REV_RANGE_LEN 2 * GIT_MAX_HEXSZ + 3
+
+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];
-       char rev_range[2 * 40 + 3];
-       char *rev_argv[] = { NULL, "--reverse", "--format=email", rev_range };
+       struct object_id new_rev_oid, old_rev_oid;
+       char rev_range[REV_RANGE_LEN];
+       const char *rev_argv[] = { NULL, "--reverse", "--format=email", rev_range, "--", prefix, NULL };
+       int rev_argc = ARRAY_SIZE(rev_argv) - 1;
        char *patchname;
 
-       if (!hex)
-               hex = ctx.qry.head;
+       if (!prefix)
+               rev_argc--;
+
+       if (!new_rev)
+               new_rev = ctx.qry.head;
 
-       if (get_sha1(hex, sha1)) {
-               cgit_print_error("Bad object id: %s", hex);
+       if (get_oid(new_rev, &new_rev_oid)) {
+               cgit_print_error_page(404, "Not found",
+                               "Bad object id: %s", new_rev);
                return;
        }
-       commit = lookup_commit_reference(sha1);
+       commit = lookup_commit_reference(the_repository, &new_rev_oid);
        if (!commit) {
-               cgit_print_error("Bad commit reference: %s", hex);
+               cgit_print_error_page(404, "Not found",
+                               "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_oid(old_rev, &old_rev_oid)) {
+                       cgit_print_error_page(404, "Not found",
+                                       "Bad object id: %s", old_rev);
+                       return;
+               }
+               if (!lookup_commit_reference(the_repository, &old_rev_oid)) {
+                       cgit_print_error_page(404, "Not found",
+                                       "Bad commit reference: %s", old_rev);
+                       return;
+               }
+       } else if (commit->parents && commit->parents->item) {
+               oidcpy(&old_rev_oid, &commit->parents->item->object.oid);
+       } else {
+               oidclr(&old_rev_oid);
+       }
+
+       if (is_null_oid(&old_rev_oid)) {
+               memcpy(rev_range, oid_to_hex(&new_rev_oid), GIT_SHA1_HEXSZ + 1);
        } else {
-               hashclr(old_sha1);
-               memcpy(rev_range, sha1_to_hex(sha1), 41);
+               xsnprintf(rev_range, REV_RANGE_LEN, "%s..%s", oid_to_hex(&old_rev_oid),
+                       oid_to_hex(&new_rev_oid));
        }
 
-       patchname = fmt("%s.patch", sha1_to_hex(sha1));
+       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 "
@@ -58,13 +83,16 @@ void cgit_print_patch(char *hex, const char *prefix)
        rev.verbose_header = 1;
        rev.diff = 1;
        rev.show_root_diff = 1;
-       rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
-       setup_revisions(ARRAY_SIZE(rev_argv), (const char **)rev_argv, &rev,
-                       NULL);
+       rev.max_parents = 1;
+       rev.diffopt.output_format |= DIFF_FORMAT_DIFFSTAT |
+                       DIFF_FORMAT_PATCH | DIFF_FORMAT_SUMMARY;
+       if (prefix)
+               rev.diffopt.stat_sep = fmt("(limited to '%s')\n\n", prefix);
+       setup_revisions(rev_argc, rev_argv, &rev, NULL);
        prepare_revision_walk(&rev);
 
        while ((commit = get_revision(&rev)) != NULL) {
                log_tree_commit(&rev, commit);
-               printf("--\ncgit %s\n", cgit_version);
+               printf("-- \ncgit %s\n\n", cgit_version);
        }
 }