git: update to v2.31.1

[cgit.git] / ui-patch.c

diff --git a/ui-patch.c b/ui-patch.c
index e7a010accb58f0489f839a19fd3007733199c6ac..4ac03cbef1d810901c185aedbd7b4b58bbff998f 100644 (file)
--- a/ui-patch.c
+++ b/ui-patch.c
@@ -1,110 +1,98 @@
 /* ui-patch.c: generate patch view
  *
 /* 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)
  */
 
 #include "cgit.h"
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"

+#include "ui-patch.h"
+#include "html.h"
+#include "ui-shared.h"

 
 

-static void print_line(char *line, int len)
-{
-       char c = line[len-1];
-
-       line[len-1] = '\0';
-       htmlf("%s\n", line);
-       line[len-1] = c;
-}
+/* two commit hashes with two dots in between and termination */
+#define REV_RANGE_LEN 2 * GIT_MAX_HEXSZ + 3

 
 

-static void header(unsigned char *sha1, char *path1, int mode1,
-                  unsigned char *sha2, char *path2, int mode2)
+void cgit_print_patch(const char *new_rev, const char *old_rev,
+                     const char *prefix)

 {
 {

-       char *abbrev1, *abbrev2;
-       int subproject;
-
-       subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2));
-       htmlf("diff --git a/%s b/%s\n", path1, path2);
+       struct rev_info rev;
+       struct commit *commit;
+       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 (is_null_sha1(sha1))
-               path1 = "dev/null";
-       if (is_null_sha1(sha2))
-               path2 = "dev/null";
+       if (!prefix)
+               rev_argc--;

 
 

-       if (mode1 == 0)
-               htmlf("new file mode %.6o\n", mode2);
+       if (!new_rev)
+               new_rev = ctx.qry.head;

 
 

-       if (mode2 == 0)
-               htmlf("deleted file mode %.6o\n", mode1);
+       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(the_repository, &new_rev_oid);
+       if (!commit) {
+               cgit_print_error_page(404, "Not found",
+                               "Bad commit reference: %s", new_rev);
+               return;
+       }

 
 

-       if (!subproject) {
-               abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV));
-               abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV));
-               htmlf("index %s..%s", abbrev1, abbrev2);
-               free(abbrev1);
-               free(abbrev2);
-               if (mode1 != 0 && mode2 != 0) {
-                       htmlf(" %.6o", mode1);
-                       if (mode2 != mode1)
-                               htmlf("..%.6o", mode2);
+       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;

                }
                }

-               htmlf("\n--- a/%s\n", path1);
-               htmlf("+++ b/%s\n", path2);
+       } else if (commit->parents && commit->parents->item) {
+               oidcpy(&old_rev_oid, &commit->parents->item->object.oid);
+       } else {
+               oidclr(&old_rev_oid);

        }
        }

-}

 
 

-static void filepair_cb(struct diff_filepair *pair)
-{
-       header(pair->one->sha1, pair->one->path, pair->one->mode,
-              pair->two->sha1, pair->two->path, pair->two->mode);
-       if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) {
-               if (S_ISGITLINK(pair->one->mode))
-                       print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52);
-               if (S_ISGITLINK(pair->two->mode))
-                       print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52);
-               return;
+       if (is_null_oid(&old_rev_oid)) {
+               memcpy(rev_range, oid_to_hex(&new_rev_oid), the_hash_algo->hexsz + 1);
+       } else {
+               xsnprintf(rev_range, REV_RANGE_LEN, "%s..%s", oid_to_hex(&old_rev_oid),
+                       oid_to_hex(&new_rev_oid));

        }
        }

-       if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line))
-               html("Error running diff");
-}
-
-void cgit_print_patch(char *hex, struct cacheitem *item)
-{
-       struct commit *commit;
-       struct commitinfo *info;
-       unsigned char sha1[20], old_sha1[20];
-       char *patchname;

 
 

-       if (!hex)
-               hex = cgit_query_head;
+       patchname = fmt("%s.patch", rev_range);
+       ctx.page.mimetype = "text/plain";
+       ctx.page.filename = patchname;
+       cgit_print_http_headers();

 
 

-       if (get_sha1(hex, sha1)) {
-               cgit_print_error(fmt("Bad object id: %s", hex));
-               return;
-       }
-       commit = lookup_commit_reference(sha1);
-       if (!commit) {
-               cgit_print_error(fmt("Bad commit reference: %s", hex));
-               return;
+       if (ctx.cfg.noplainemail) {
+               rev_argv[2] = "--format=format:From %H Mon Sep 17 00:00:00 "
+                             "2001%nFrom: %an%nDate: %aD%n%w(78,0,1)Subject: "
+                             "%s%n%n%w(0)%b";

        }
        }

-       info = cgit_parse_commit(commit);
-       hashcpy(old_sha1, commit->parents->item->object.sha1);

 
 

-       patchname = fmt("%s.patch", sha1_to_hex(sha1));
-       cgit_print_snapshot_start("text/plain", patchname, item);
-       htmlf("From %s Mon Sep 17 00:00:00 2001\n", sha1_to_hex(sha1));
-       htmlf("From: %s%s\n", info->author, info->author_email);
-       html("Date: ");
-       cgit_print_date(info->author_date, "%a, %d  %b  %Y  %H:%M:%S  %z%n");
-       htmlf("Subject: %s\n\n", info->subject);
-       if (info->msg && *info->msg) {
-               htmlf("%s", info->msg);
-               if (info->msg[strlen(info->msg) - 1] != '\n')
-                       html("\n");
+       init_revisions(&rev, NULL);
+       rev.abbrev = DEFAULT_ABBREV;
+       rev.verbose_header = 1;
+       rev.diff = 1;
+       rev.show_root_diff = 1;
+       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\n", cgit_version);

        }
        }

-       html("---\n");
-       cgit_diff_tree(old_sha1, sha1, filepair_cb, NULL);
-       html("--\n");
-       htmlf("cgit %s\n", CGIT_VERSION);
-       cgit_free_commitinfo(info);

 }
 }