X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/66cacd053ba900c8eb3b7962027370c84a97f990..3ce6fc16ef4670c535c6e35d48c7f980ff8a5532:/ui-diff.c

diff --git a/ui-diff.c b/ui-diff.c
index b6486f1..e6b957c 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -7,10 +7,6 @@
  */
 
 #include "cgit.h"
-#include "xdiff.h"
-
-char *diff_buffer;
-int diff_buffer_size;
 
 
 /*
@@ -35,96 +31,112 @@ static void print_line(char *line, int len)
 	line[len-1] = c;
 }
 
-/*
- * Receive diff-buffers from xdiff and concatenate them as
- * needed across multiple callbacks.
- *
- * This is basically a copy of xdiff-interface.c/xdiff_outf(),
- * ripped from git and modified to use globals instead of
- * a special callback-struct.
- */
-int diff_cb(void *priv_, mmbuffer_t *mb, int nbuf)
+static void header(unsigned char *sha1, char *path1, int mode1,
+		   unsigned char *sha2, char *path2, int mode2)
 {
-	int i;
-
-	for (i = 0; i < nbuf; i++) {
-		if (mb[i].ptr[mb[i].size-1] != '\n') {
-			/* Incomplete line */
-			diff_buffer = xrealloc(diff_buffer,
-					       diff_buffer_size + mb[i].size);
-			memcpy(diff_buffer + diff_buffer_size,
-			       mb[i].ptr, mb[i].size);
-			diff_buffer_size += mb[i].size;
-			continue;
+	char *abbrev1, *abbrev2;
+	int subproject;
+
+	subproject = (S_ISDIRLNK(mode1) || S_ISDIRLNK(mode2));
+	html("<div class='head'>");
+	html("diff --git a/");
+	html_txt(path1);
+	html(" b/");
+	html_txt(path2);
+
+	if (is_null_sha1(sha1))
+		path1 = "dev/null";
+	if (is_null_sha1(sha2))
+		path2 = "dev/null";
+
+	if (mode1 == 0)
+		htmlf("<br/>new file mode %.6o", mode2);
+
+	if (mode2 == 0)
+		htmlf("<br/>deleted file mode %.6o", mode1);
+
+	if (!subproject) {
+		abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV));
+		abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV));
+		htmlf("<br/>index %s..%s", abbrev1, abbrev2);
+		free(abbrev1);
+		free(abbrev2);
+		if (mode1 != 0 && mode2 != 0) {
+			htmlf(" %.6o", mode1);
+			if (mode2 != mode1)
+				htmlf("..%.6o", mode2);
 		}
-
-		/* we have a complete line */
-		if (!diff_buffer) {
-			print_line(mb[i].ptr, mb[i].size);
-			continue;
-		}
-		diff_buffer = xrealloc(diff_buffer,
-				       diff_buffer_size + mb[i].size);
-		memcpy(diff_buffer + diff_buffer_size, mb[i].ptr, mb[i].size);
-		print_line(diff_buffer, diff_buffer_size + mb[i].size);
-		free(diff_buffer);
-		diff_buffer = NULL;
-		diff_buffer_size = 0;
-	}
-	if (diff_buffer) {
-		print_line(diff_buffer, diff_buffer_size);
-		free(diff_buffer);
-		diff_buffer = NULL;
-		diff_buffer_size = 0;
+		html("<br/>--- a/");
+		html_txt(path1);
+		html("<br/>+++ b/");
+		html_txt(path2);
 	}
-	return 0;
-}
-
-static int load_mmfile(mmfile_t *file, const unsigned char *sha1)
-{
-	char type[20];
-
-	if (is_null_sha1(sha1)) {
-		file->ptr = (char *)"";
-		file->size = 0;
-	} else {
-		file->ptr = read_sha1_file(sha1, type, &file->size);
-	}
-	return 1;
+	html("</div>");
 }
 
-static void run_diff(const unsigned char *sha1, const unsigned char *sha2)
+static void filepair_cb(struct diff_filepair *pair)
 {
-	mmfile_t file1, file2;
-	xpparam_t diff_params;
-	xdemitconf_t emit_params;
-	xdemitcb_t emit_cb;
-
-	if (!load_mmfile(&file1, sha1) || !load_mmfile(&file2, sha2)) {
-		cgit_print_error("Unable to load files for diff");
+	header(pair->one->sha1, pair->one->path, pair->one->mode,
+	       pair->two->sha1, pair->two->path, pair->two->mode);
+	if (S_ISDIRLNK(pair->one->mode) || S_ISDIRLNK(pair->two->mode)) {
+		if (S_ISDIRLNK(pair->one->mode))
+			print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52);
+		if (S_ISDIRLNK(pair->two->mode))
+			print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52);
 		return;
 	}
-
-	diff_params.flags = XDF_NEED_MINIMAL;
-
-	emit_params.ctxlen = 3;
-	emit_params.flags = XDL_EMIT_FUNCNAMES;
-
-	emit_cb.outf = diff_cb;
-
-	xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb);
+	if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line))
+		cgit_print_error("Error running diff");
 }
 
-
-
-void cgit_print_diff(const char *old_hex, const char *new_hex)
+void cgit_print_diff(const char *head, const char *old_hex, const char *new_hex, char *path)
 {
 	unsigned char sha1[20], sha2[20];
+	enum object_type type;
+	unsigned long size;
+	struct commit *commit;
+
+	if (head && !old_hex && !new_hex) {
+		get_sha1(head, sha1);
+		commit = lookup_commit_reference(sha1);
+		if (commit && !parse_commit(commit)) {
+			html("<table class='diff'>");
+			html("<tr><td>");
+			cgit_diff_commit(commit, filepair_cb);
+			html("</td></tr>");
+			html("</table>");
+		}
+		return;
+	}
 
 	get_sha1(old_hex, sha1);
 	get_sha1(new_hex, sha2);
 
-	html("<table class='diff'><tr><td>");
-	run_diff(sha1, sha2);
-	html("</td></tr></table>");
+	type = sha1_object_info(sha1, &size);
+	if (type == OBJ_BAD) {
+		type = sha1_object_info(sha2, &size);
+		if (type == OBJ_BAD) {
+			cgit_print_error(fmt("Bad object names: %s, %s", old_hex, new_hex));
+			return;
+		}
+	}
+
+	html("<table class='diff'>");
+	switch(type) {
+	case OBJ_BLOB:
+		html("<tr><td>");
+		header(sha1, path, 0644, sha2, path, 0644);
+		if (cgit_diff_files(sha1, sha2, print_line))
+			cgit_print_error("Error running diff");
+		html("</td></tr>");
+		break;
+	case OBJ_TREE:
+		cgit_diff_tree(sha1, sha2, filepair_cb);
+		break;
+	default:
+		cgit_print_error(fmt("Unhandled object type: %s",
+				     typename(type)));
+		break;
+	}
+	html("</table>");
 }