X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/5c5d189635287a3bfaa1a4aef133dc0c582a27c2..747b035dda97ae359ed00d84744acfa8cc009fb2:/ui-patch.c

diff --git a/ui-patch.c b/ui-patch.c
index d13104c..3922a44 100644
--- a/ui-patch.c
+++ b/ui-patch.c
@@ -7,76 +7,10 @@
  */
 
 #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 (is_null_sha1(sha1))
-		path1 = "dev/null";
-	if (is_null_sha1(sha2))
-		path2 = "dev/null";
-
-	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);
-		}
-		htmlf("\n--- a/%s\n", path1);
-		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, print_line))
-		html("Error running diff");
-	if (binary)
-		html("Binary files differ\n");
-}
-
 void cgit_print_patch(char *hex, const char *prefix)
 {
 	struct commit *commit;
@@ -88,12 +22,12 @@ void cgit_print_patch(char *hex, const char *prefix)
 		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);
@@ -124,8 +58,8 @@ void cgit_print_patch(char *hex, const char *prefix)
 	html("---\n");
 	if (prefix)
 		htmlf("(limited to '%s')\n\n", prefix);
-	cgit_diff_tree(old_sha1, sha1, filepair_cb, prefix);
+	cgit_diff_tree(old_sha1, sha1, filepair_cb_raw, prefix, 0);
 	html("--\n");
-	htmlf("cgit %s\n", CGIT_VERSION);
+	htmlf("cgit %s\n", cgit_version);
 	cgit_free_commitinfo(info);
 }