X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/62a40c78fed772e795eca8d4e7d6f6ead4d9a125..455b598:/ui-patch.c

diff --git a/ui-patch.c b/ui-patch.c
index 79bc509..72c9749 100644
--- a/ui-patch.c
+++ b/ui-patch.c
@@ -7,130 +7,64 @@
  */
 
 #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;
-}
-
-static void header(unsigned char *sha1, char *path1, int mode1,
-		   unsigned char *sha2, char *path2, int mode2)
-{
-	char *abbrev1, *abbrev2;
-	int subproject;
-
-	subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2));
-	htmlf("diff --git a/%s b/%s\n", path1, path2);
-
-	if (mode1 == 0)
-		htmlf("new file mode %.6o\n", mode2);
-
-	if (mode2 == 0)
-		htmlf("deleted file mode %.6o\n", mode1);
-
-	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 (is_null_sha1(sha1)) {
-			path1 = "dev/null";
-			htmlf("\n--- /%s\n", path1);
-		} else
-			htmlf("\n--- a/%s\n", path1);
-
-		if (is_null_sha1(sha2)) {
-			path2 = "dev/null";
-			htmlf("+++ /%s\n", path2);
-		} else
-			htmlf("+++ b/%s\n", path2);
-	}
-}
-
-static void filepair_cb(struct diff_filepair *pair)
-{
-	unsigned long old_size = 0;
-	unsigned long new_size = 0;
-	int binary = 0;
-
-	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 (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,
-			    &new_size, &binary, 0, 0, print_line))
-		html("Error running diff");
-	if (binary)
-		html("Binary files differ\n");
-}
-
 void cgit_print_patch(char *hex, const char *prefix)
 {
+	struct rev_info rev;
 	struct commit *commit;
-	struct commitinfo *info;
 	unsigned char sha1[20], old_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 (get_sha1(hex, sha1)) {
-		cgit_print_error(fmt("Bad object id: %s", hex));
+		cgit_print_error("Bad object id: %s", hex);
 		return;
 	}
 	commit = lookup_commit_reference(sha1);
 	if (!commit) {
-		cgit_print_error(fmt("Bad commit reference: %s", hex));
+		cgit_print_error("Bad commit reference: %s", hex);
 		return;
 	}
-	info = cgit_parse_commit(commit);
 
-	if (commit->parents && commit->parents->item)
+	if (commit->parents && commit->parents->item) {
 		hashcpy(old_sha1, commit->parents->item->object.sha1);
-	else
+		sprintf(rev_range, "%s..%s", sha1_to_hex(old_sha1),
+			sha1_to_hex(sha1));
+	} else {
 		hashclr(old_sha1);
+		memcpy(rev_range, sha1_to_hex(sha1), 41);
+	}
 
 	patchname = fmt("%s.patch", sha1_to_hex(sha1));
 	ctx.page.mimetype = "text/plain";
 	ctx.page.filename = patchname;
 	cgit_print_http_headers(&ctx);
-	htmlf("From %s Mon Sep 17 00:00:00 2001\n", sha1_to_hex(sha1));
-	htmlf("From: %s", info->author);
-	if (!ctx.cfg.noplainemail) {
-		htmlf(" %s", info->author_email);
+
+	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";
 	}
-	html("\n");
-	html("Date: ");
-	cgit_print_date(info->author_date, "%a, %d %b %Y %H:%M:%S %z%n", ctx.cfg.local_time);
-	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.diffopt.output_format |= DIFF_FORMAT_PATCH;
+	setup_revisions(ARRAY_SIZE(rev_argv), (const char **)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);
 	}
-	html("---\n");
-	if (prefix)
-		htmlf("(limited to '%s')\n\n", prefix);
-	cgit_diff_tree(old_sha1, sha1, filepair_cb, prefix, 0);
-	html("--\n");
-	htmlf("cgit %s\n", CGIT_VERSION);
-	cgit_free_commitinfo(info);
 }