cgit

diff --git a/Makefile b/Makefile
index 58a583b339463db275ec54b402c8092a5b8ff62c..4aa7afec63606d317ec8c52cf5e664b21c3ab5a7 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ CACHE_ROOT = /var/cache/cgit
 
 EXTLIBS = ../git/libgit.a ../git/xdiff/lib.a -lz -lcrypto
 OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \
-	ui-summary.o ui-log.o ui-view.c ui-tree.c ui-commit.c
+	ui-summary.o ui-log.o ui-view.c ui-tree.c ui-commit.c ui-diff.o
 
 CFLAGS += -Wall
 




diff --git a/cgit.c b/cgit.c
index 372b4364ec06eca79e4894133e998c69731c8e96..ac434410a484d9f06c4bec3cf96c0af352c0a4eb 100644
--- a/cgit.c
+++ b/cgit.c
@@ -36,6 +36,8 @@ 	} else if (!strcmp(cgit_query_page, "commit")) {
 		cgit_print_commit(cgit_query_sha1);
 	} else if (!strcmp(cgit_query_page, "view")) {
 		cgit_print_view(cgit_query_sha1);
+	} else if (!strcmp(cgit_query_page, "diff")) {
+		cgit_print_diff(cgit_query_sha1, cgit_query_sha2);
 	}
 	cgit_print_docend();
 }




diff --git a/cgit.css b/cgit.css
index 5f0192650efb226d77963ab209104306ed60870d..7b8e468f179c0d616ea0ec20a57a9339b44c1505 100644
--- a/cgit.css
+++ b/cgit.css
@@ -77,11 +77,17 @@ 	color: red;
 	font-weight: bold;
 	margin: 1em 2em;
 }
+div.ls-blob, div.ls-dir {
+	font-family: monospace;
+}
 div.ls-dir a {
 	font-weight: bold;
 }
 th.filesize, td.filesize {
 	text-align: right;
+}
+td.filesize {
+	font-family: monospace;
 }
 td.filemode {
 	font-family: monospace;
@@ -154,6 +160,25 @@ 	/* border-top: solid 1px black; */
 	color: #888;
 	padding-top: 0.5em;
 }
+
+table.diff td {
+	border: solid 1px black;
+	font-family: monospace;
+	white-space: pre;
+}
+
+table.diff td div.hunk {
+	background: #ccc;
+}
+
+table.diff td div.add {
+	color: green;
+}
+
+table.diff td div.del {
+	color: red;
+}
+
 .sha1 {
 	font-family: courier;
 	font-size: 90%;




diff --git a/cgit.h b/cgit.h
index 37584d6d5b4531c65375a357bfcf25ec5a091778..bba2d6c506373ba3ed3c5cdacac34a3d5b076968 100644
--- a/cgit.h
+++ b/cgit.h
@@ -57,6 +57,7 @@ extern char *cgit_query_repo;
 extern char *cgit_query_page;
 extern char *cgit_query_head;
 extern char *cgit_query_sha1;
+extern char *cgit_query_sha2;
 extern int   cgit_query_ofs;
 
 extern int htmlfd;
@@ -104,5 +105,6 @@ extern void cgit_print_log(const char *tip, int ofs, int cnt);
 extern void cgit_print_view(const char *hex);
 extern void cgit_print_tree(const char *hex);
 extern void cgit_print_commit(const char *hex);
+extern void cgit_print_diff(const char *old_hex, const char *new_hex);
 
 #endif /* CGIT_H */




diff --git a/shared.c b/shared.c
index b576df8496f3cdbc1767ae68b858ccf753896521..762eb382d93666fa772226d436d1d6ac1a109826 100644
--- a/shared.c
+++ b/shared.c
@@ -37,6 +37,7 @@ char *cgit_query_repo   = NULL;
 char *cgit_query_page   = NULL;
 char *cgit_query_head   = NULL;
 char *cgit_query_sha1   = NULL;
+char *cgit_query_sha2   = NULL;
 int   cgit_query_ofs    = 0;
 
 int htmlfd = 0;
@@ -82,6 +83,9 @@ 		cgit_query_head = xstrdup(value);
 		cgit_query_has_symref = 1;
 	} else if (!strcmp(name, "id")) {
 		cgit_query_sha1 = xstrdup(value);
+		cgit_query_has_sha1 = 1;
+	} else if (!strcmp(name, "id2")) {
+		cgit_query_sha2 = xstrdup(value);
 		cgit_query_has_sha1 = 1;
 	} else if (!strcmp(name, "ofs")) {
 		cgit_query_ofs = atoi(value);




diff --git a/ui-diff.c b/ui-diff.c
new file mode 100644
index 0000000000000000000000000000000000000000..0bd9ade7b5c2bef7383e713c00a0f73350ce141a
--- /dev/null
+++ b/ui-diff.c
@@ -0,0 +1,131 @@
+/* ui-diff.c: show diff between two blobs
+ *
+ * Copyright (C) 2006 Lars Hjemli
+ *
+ * Licensed under GNU General Public License v2
+ *   (see COPYING for full license text)
+ */
+
+#include "cgit.h"
+#include "xdiff.h"
+
+char *diff_buffer;
+int diff_buffer_size;
+
+
+/*
+ * print a single line returned from xdiff
+ */
+static void print_line(char *line, int len)
+{
+	char *class = "ctx";
+	char c = line[len-1];
+
+	if (line[0] == '+')
+		class = "add";
+	else if (line[0] == '-')
+		class = "del";
+	else if (line[0] == '@')
+		class = "hunk";
+
+	htmlf("<div class='%s'>", class);
+	line[len-1] = '\0';
+	html_txt(line);
+	html("</div>");
+	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)
+{
+	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;
+		}
+
+		/* 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;
+	}
+	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;
+}
+
+static void run_diff(const unsigned char *sha1, const unsigned char *sha2)
+{
+	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");
+		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);
+}
+
+
+
+void cgit_print_diff(const char *old_hex, const char *new_hex)
+{
+	unsigned char sha1[20], sha2[20];
+
+	get_sha1(old_hex, sha1);
+	get_sha1(new_hex, sha2);
+
+	html("<h2>diff</h2>\n");
+	html("<table class='diff'><tr><td>");
+	run_diff(sha1, sha2);
+	html("</td></tr></table>");
+}




diff --git a/xdiff.h b/xdiff.h
new file mode 100644
index 0000000000000000000000000000000000000000..fa409d5234009bf6ddac8803e8d20ed1b23a3258
--- /dev/null
+++ b/xdiff.h
@@ -0,0 +1,105 @@
+/*
+ *  LibXDiff by Davide Libenzi ( File Differential Library )
+ *  Copyright (C) 2003  Davide Libenzi
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  Davide Libenzi <davidel@xmailserver.org>
+ *
+ */
+
+#if !defined(XDIFF_H)
+#define XDIFF_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* #ifdef __cplusplus */
+
+
+#define XDF_NEED_MINIMAL (1 << 1)
+#define XDF_IGNORE_WHITESPACE (1 << 2)
+#define XDF_IGNORE_WHITESPACE_CHANGE (1 << 3)
+#define XDF_WHITESPACE_FLAGS (XDF_IGNORE_WHITESPACE | XDF_IGNORE_WHITESPACE_CHANGE)
+
+#define XDL_PATCH_NORMAL '-'
+#define XDL_PATCH_REVERSE '+'
+#define XDL_PATCH_MODEMASK ((1 << 8) - 1)
+#define XDL_PATCH_IGNOREBSPACE (1 << 8)
+
+#define XDL_EMIT_FUNCNAMES (1 << 0)
+#define XDL_EMIT_COMMON (1 << 1)
+
+#define XDL_MMB_READONLY (1 << 0)
+
+#define XDL_MMF_ATOMIC (1 << 0)
+
+#define XDL_BDOP_INS 1
+#define XDL_BDOP_CPY 2
+#define XDL_BDOP_INSB 3
+
+#define XDL_MERGE_MINIMAL 0
+#define XDL_MERGE_EAGER 1
+#define XDL_MERGE_ZEALOUS 2
+
+typedef struct s_mmfile {
+	char *ptr;
+	long size;
+} mmfile_t;
+
+typedef struct s_mmbuffer {
+	char *ptr;
+	long size;
+} mmbuffer_t;
+
+typedef struct s_xpparam {
+	unsigned long flags;
+} xpparam_t;
+
+typedef struct s_xdemitcb {
+	void *priv;
+	int (*outf)(void *, mmbuffer_t *, int);
+} xdemitcb_t;
+
+typedef struct s_xdemitconf {
+	long ctxlen;
+	unsigned long flags;
+} xdemitconf_t;
+
+typedef struct s_bdiffparam {
+	long bsize;
+} bdiffparam_t;
+
+
+#define xdl_malloc(x) malloc(x)
+#define xdl_free(ptr) free(ptr)
+#define xdl_realloc(ptr,x) realloc(ptr,x)
+
+void *xdl_mmfile_first(mmfile_t *mmf, long *size);
+void *xdl_mmfile_next(mmfile_t *mmf, long *size);
+long xdl_mmfile_size(mmfile_t *mmf);
+
+int xdl_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp,
+	     xdemitconf_t const *xecfg, xdemitcb_t *ecb);
+
+int xdl_merge(mmfile_t *orig, mmfile_t *mf1, const char *name1,
+		mmfile_t *mf2, const char *name2,
+		xpparam_t const *xpp, int level, mmbuffer_t *result);
+
+#ifdef __cplusplus
+}
+#endif /* #ifdef __cplusplus */
+
+#endif /* #if !defined(XDIFF_H) */
+