X-Git-Url: https://git.cameronkatri.com/cgit.git/blobdiff_plain/a342ac6b4d7830f82230b0f6a29bc9378d66747e..a4d1ca1dc6ff8171694d9e2280b6075a1beced0c:/ui-diff.c

diff --git a/ui-diff.c b/ui-diff.c
index 7ec5701..2a22009 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -7,7 +7,11 @@
  */
 
 #include "cgit.h"
+#include "html.h"
+#include "ui-shared.h"
 
+unsigned char old_rev_sha1[20];
+unsigned char new_rev_sha1[20];
 
 /*
  * print a single line returned from xdiff
@@ -31,72 +35,116 @@ static void print_line(char *line, int len)
 	line[len-1] = c;
 }
 
-static void header(unsigned char *sha1, char *path1,
-		   unsigned char *sha2, char *path2)
+static void header(unsigned char *sha1, char *path1, int mode1,
+		   unsigned char *sha2, char *path2, int mode2)
 {
 	char *abbrev1, *abbrev2;
+	int subproject;
 
-	html("<tr><td>");
+	subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2));
 	html("<div class='head'>");
 	html("diff --git a/");
 	html_txt(path1);
 	html(" b/");
 	html_txt(path2);
-	abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV));
-	abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV));
-	htmlf("\nindex %s..%s", abbrev1, abbrev2);
-	free(abbrev1);
-	free(abbrev2);
-	html("\n--- a/");
-	html_txt(path1);
-	html("\n+++ 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);
+		}
+		html("<br/>--- a/");
+		if (mode1 != 0)
+			cgit_tree_link(path1, NULL, NULL, ctx.qry.head,
+				       sha1_to_hex(old_rev_sha1), path1);
+		else
+			html_txt(path1);
+		html("<br/>+++ b/");
+		if (mode2 != 0)
+			cgit_tree_link(path2, NULL, NULL, ctx.qry.head,
+				       sha1_to_hex(new_rev_sha1), path2);
+		else
+			html_txt(path2);
+	}
 	html("</div>");
 }
 
 static void filepair_cb(struct diff_filepair *pair)
 {
-	header(pair->one->sha1, pair->one->path,
-	       pair->two->sha1, pair->two->path);
+	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, print_line))
 		cgit_print_error("Error running diff");
-	html("</tr></td>");
 }
 
-void cgit_print_diff(const char *old_hex, const char *new_hex, char *path)
+void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefix)
 {
-	unsigned char sha1[20], sha2[20];
 	enum object_type type;
 	unsigned long size;
+	struct commit *commit, *commit2;
 
-	get_sha1(old_hex, sha1);
-	get_sha1(new_hex, sha2);
-
-	type = sha1_object_info(sha1, &size);
+	if (!new_rev)
+		new_rev = ctx.qry.head;
+	get_sha1(new_rev, new_rev_sha1);
+	type = sha1_object_info(new_rev_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;
-		}
+		cgit_print_error(fmt("Bad object name: %s", new_rev));
+		return;
 	}
-
-	html("<table class='diff'>");
-	switch(type) {
-	case OBJ_BLOB:
-		html("<tr><td>");
-		header(sha1, path, sha2, path);
-		if (cgit_diff_files(sha1, sha2, print_line))
-			cgit_print_error("Error running diff");
-		html("</tr></td>");
-		break;
-	case OBJ_TREE:
-		cgit_diff_tree(sha1, sha2, filepair_cb);
-		break;
-	default:
+	if (type != OBJ_COMMIT) {
 		cgit_print_error(fmt("Unhandled object type: %s",
 				     typename(type)));
-		break;
+		return;
 	}
-	html("</td></tr></table>");
+
+	commit = lookup_commit_reference(new_rev_sha1);
+	if (!commit || parse_commit(commit))
+		cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(new_rev_sha1)));
+
+	if (old_rev)
+		get_sha1(old_rev, old_rev_sha1);
+	else if (commit->parents && commit->parents->item)
+		hashcpy(old_rev_sha1, commit->parents->item->object.sha1);
+	else
+		hashclr(old_rev_sha1);
+
+	if (!is_null_sha1(old_rev_sha1)) {
+		type = sha1_object_info(old_rev_sha1, &size);
+		if (type == OBJ_BAD) {
+			cgit_print_error(fmt("Bad object name: %s", sha1_to_hex(old_rev_sha1)));
+			return;
+		}
+		commit2 = lookup_commit_reference(old_rev_sha1);
+		if (!commit2 || parse_commit(commit2))
+			cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(old_rev_sha1)));
+	}
+	html("<table summary='diff' class='diff'>");
+	html("<tr><td>");
+	cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix);
+	html("</td></tr>");
+	html("</table>");
 }