X-Git-Url: https://git.cameronkatri.com/cgit.git/blobdiff_plain/f7f26f88755ac6a3b9af4918b51b0d6e7a692c78..c712d5ac434b9ee8cb4e63a173a2538e1878637f:/ui-patch.c

diff --git a/ui-patch.c b/ui-patch.c
index 3086608..8007a11 100644
--- a/ui-patch.c
+++ b/ui-patch.c
@@ -16,50 +16,58 @@ void cgit_print_patch(const char *new_rev, const char *old_rev,
 {
 	struct rev_info rev;
 	struct commit *commit;
-	unsigned char new_rev_sha1[20], old_rev_sha1[20];
+	struct object_id new_rev_oid, old_rev_oid;
 	char rev_range[2 * 40 + 3];
-	char *rev_argv[] = { NULL, "--reverse", "--format=email", rev_range };
+	const char *rev_argv[] = { NULL, "--reverse", "--format=email", rev_range, "--", prefix, NULL };
+	int rev_argc = ARRAY_SIZE(rev_argv) - 1;
 	char *patchname;
 
+	if (!prefix)
+		rev_argc--;
+
 	if (!new_rev)
 		new_rev = ctx.qry.head;
 
-	if (get_sha1(new_rev, new_rev_sha1)) {
-		cgit_print_error("Bad object id: %s", new_rev);
+	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(new_rev_sha1);
+	commit = lookup_commit_reference(&new_rev_oid);
 	if (!commit) {
-		cgit_print_error("Bad commit reference: %s", new_rev);
+		cgit_print_error_page(404, "Not found",
+				"Bad commit reference: %s", new_rev);
 		return;
 	}
 
 	if (old_rev) {
-		if (get_sha1(old_rev, old_rev_sha1)) {
-			cgit_print_error("Bad object id: %s", 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(old_rev_sha1)) {
-			cgit_print_error("Bad commit reference: %s", old_rev);
+		if (!lookup_commit_reference(&old_rev_oid)) {
+			cgit_print_error_page(404, "Not found",
+					"Bad commit reference: %s", old_rev);
 			return;
 		}
 	} else if (commit->parents && commit->parents->item) {
-		hashcpy(old_rev_sha1, commit->parents->item->object.sha1);
+		oidcpy(&old_rev_oid, &commit->parents->item->object.oid);
 	} else {
-		hashclr(old_rev_sha1);
+		oidclr(&old_rev_oid);
 	}
 
-	if (is_null_sha1(old_rev_sha1)) {
-		memcpy(rev_range, sha1_to_hex(new_rev_sha1), 41);
+	if (is_null_oid(&old_rev_oid)) {
+		memcpy(rev_range, oid_to_hex(&new_rev_oid), GIT_SHA1_HEXSZ + 1);
 	} else {
-		sprintf(rev_range, "%s..%s", sha1_to_hex(old_rev_sha1),
-			sha1_to_hex(new_rev_sha1));
+		sprintf(rev_range, "%s..%s", oid_to_hex(&old_rev_oid),
+			oid_to_hex(&new_rev_oid));
 	}
 
 	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 "
@@ -73,9 +81,11 @@ 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.diffopt.output_format |= DIFF_FORMAT_PATCH;
-	setup_revisions(ARRAY_SIZE(rev_argv), (const char **)rev_argv, &rev,
-			NULL);
+	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) {