Add URL parameter 'context' for changing the number of context lines in diffs

The new ctx.qry.context variable is picked up by cgit_print_diff(), and
passed via cgit_diff_files() to Git's diff machinery.

Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>

6 files changed, 11 insertions, 7 deletions

diff --git a/cgit.c b/cgit.c
index 2c3ad73..e9bafb5 100644
--- a/cgit.c
+++ b/cgit.c
@@ -251,4 +251,6 @@ static void querystring_cb(const char *name, const char *value)
 	} else if (!strcmp(name, "ss")) {
 		ctx.qry.ssdiff = atoi(value);
+	} else if (!strcmp(name, "context")) {
+		ctx.qry.context = atoi(value);
 	}
 }
diff --git a/cgit.h b/cgit.h
index f990b15..bb8f598 100644
--- a/cgit.h
+++ b/cgit.h
@@ -146,4 +146,5 @@ struct cgit_query {
 	int showmsg;
 	int ssdiff;
+	int context;
 	char *vpath;
 };
@@ -275,5 +276,5 @@ extern int cgit_diff_files(const unsigned char *old_sha1,
 			   const unsigned char *new_sha1,
 			   unsigned long *old_size, unsigned long *new_size,
-			   int *binary, linediff_fn fn);
+			   int *binary, int context, linediff_fn fn);
 
 extern void cgit_diff_tree(const unsigned char *old_sha1,
diff --git a/shared.c b/shared.c
index 6e8f0ce..7cf1e59 100644
--- a/shared.c
+++ b/shared.c
@@ -263,5 +263,6 @@ int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf)
 int cgit_diff_files(const unsigned char *old_sha1,
 		    const unsigned char *new_sha1, unsigned long *old_size,
-		    unsigned long *new_size, int *binary, linediff_fn fn)
+		    unsigned long *new_size, int *binary, int context,
+		    linediff_fn fn)
 {
 	mmfile_t file1, file2;
@@ -286,5 +287,5 @@ int cgit_diff_files(const unsigned char *old_sha1,
 	memset(&emit_cb, 0, sizeof(emit_cb));
 	diff_params.flags = XDF_NEED_MINIMAL;
-	emit_params.ctxlen = 3;
+	emit_params.ctxlen = context > 0 ? context : 3;
 	emit_params.flags = XDL_EMIT_FUNCNAMES;
 	emit_cb.outf = filediff_cb;
diff --git a/ui-diff.c b/ui-diff.c
index fb836df..d3a3b2c 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -128,5 +128,5 @@ static void inspect_filepair(struct diff_filepair *pair)
 	lines_removed = 0;
 	cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, &new_size,
-			&binary, count_diff_lines);
+			&binary, 0, count_diff_lines);
 	if (files >= slots) {
 		if (slots == 0)
@@ -289,5 +289,5 @@ 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_fn))
+			    &new_size, &binary, ctx.qry.context, print_line_fn))
 		cgit_print_error("Error running diff");
 	if (binary) {
diff --git a/ui-log.c b/ui-log.c
index bfbe436..5eb5c81 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -34,5 +34,5 @@ void inspect_files(struct diff_filepair *pair)
 	if (ctx.repo->enable_log_linecount)
 		cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,
-				&new_size, &binary, count_lines);
+				&new_size, &binary, 0, count_lines);
 }
 
diff --git a/ui-patch.c b/ui-patch.c
index 25dc9fe..d13104c 100644
--- a/ui-patch.c
+++ b/ui-patch.c
@@ -72,5 +72,5 @@ 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))
+			    &new_size, &binary, 0, print_line))
 		html("Error running diff");
 	if (binary)