X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/f3c1a187fe2bc33f8423cd535d5045899699995b..fe1bb0e765883fa4149fba12daee81b6ae070de3:/ui-patch.c

diff --git a/ui-patch.c b/ui-patch.c
index a77f3f6..ca008f3 100644
--- a/ui-patch.c
+++ b/ui-patch.c
@@ -8,6 +8,7 @@
 
 #include "cgit.h"
 #include "html.h"
+#include "ui-shared.h"
 
 static void print_line(char *line, int len)
 {
@@ -56,6 +57,10 @@ static void header(unsigned char *sha1, char *path1, int mode1,
 
 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)) {
@@ -65,11 +70,14 @@ static void filepair_cb(struct diff_filepair *pair)
 			print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52);
 		return;
 	}
-	if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line))
+	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, struct cacheitem *item)
+void cgit_print_patch(char *hex, const char *prefix)
 {
 	struct commit *commit;
 	struct commitinfo *info;
@@ -89,16 +97,24 @@ void cgit_print_patch(char *hex, struct cacheitem *item)
 		return;
 	}
 	info = cgit_parse_commit(commit);
-	hashcpy(old_sha1, commit->parents->item->object.sha1);
+
+	if (commit->parents && commit->parents->item)
+		hashcpy(old_sha1, commit->parents->item->object.sha1);
+	else
+		hashclr(old_sha1);
 
 	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%s\n", info->author, info->author_email);
+	htmlf("From: %s", info->author);
+	if (!ctx.cfg.noplainemail) {
+		htmlf(" %s", info->author_email);
+	}
+	html("\n");
 	html("Date: ");
-	cgit_print_date(info->author_date, "%a, %d  %b  %Y  %H:%M:%S  %z%n");
+	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);
@@ -106,7 +122,9 @@ void cgit_print_patch(char *hex, struct cacheitem *item)
 			html("\n");
 	}
 	html("---\n");
-	cgit_diff_tree(old_sha1, sha1, filepair_cb, NULL);
+	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);