First version of side-by-side diff.

This constitutes the first prototype of a side-by-side diff. It is not
possible to switch between unidiff and side-by-side diff at all at this
stage.

Signed-off-by: Ragnar Ouchterlony <ragnar@lysator.liu.se>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>

1 files changed, 13 insertions, 2 deletions

diff --git a/ui-diff.c b/ui-diff.c
index 2196745..0c6f8d7 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -11,2 +11,3 @@
 #include "ui-shared.h"
+#include "ui-ssdiff.h"
 
@@ -34,2 +35,3 @@ static struct fileinfo {
 
+static int use_ssdiff = 0;
 
@@ -246,2 +248,4 @@ static void header(unsigned char *sha1, char *path1, int mode1,
 	html("</div>");
+	if (use_ssdiff)
+		cgit_ssdiff_header();
 }
@@ -253,2 +257,3 @@ static void filepair_cb(struct diff_filepair *pair)
 	int binary = 0;
+	linediff_fn print_line_fn = print_line;
 
@@ -256,2 +261,6 @@ static void filepair_cb(struct diff_filepair *pair)
 	       pair->two->sha1, pair->two->path, pair->two->mode);
+	if (use_ssdiff) {
+		cgit_ssdiff_header();
+		print_line_fn = cgit_ssdiff_line_cb;
+	}
 	if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) {
@@ -263,4 +272,4 @@ static void filepair_cb(struct diff_filepair *pair)
 	}
-	if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, 
-			    &new_size, &binary, print_line))
+	if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,
+			    &new_size, &binary, print_line_fn))
 		cgit_print_error("Error running diff");
@@ -268,2 +277,4 @@ static void filepair_cb(struct diff_filepair *pair)
 		html("Binary files differ");
+	if (use_ssdiff)
+		cgit_ssdiff_footer();
 }