summaryrefslogtreecommitdiffabout
authorJohan Herland <johan@herland.net>2010-06-10 18:15:27 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2010-06-19 11:00:07 (UTC)
commit6180e6169d6e87a3bea7e4da835dca17f93e5cfd (patch) (side-by-side diff)
tree7caa053b419c75081179cc4a6056ce6533d01d99
parenta2cbd3c30b64a26b52b2003ba6569f3c083f4092 (diff)
downloadcgit-6180e6169d6e87a3bea7e4da835dca17f93e5cfd.zip
cgit-6180e6169d6e87a3bea7e4da835dca17f93e5cfd.tar.gz
cgit-6180e6169d6e87a3bea7e4da835dca17f93e5cfd.tar.bz2
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>
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--cgit.c2
-rw-r--r--cgit.h3
-rw-r--r--shared.c5
-rw-r--r--ui-diff.c4
-rw-r--r--ui-log.c2
-rw-r--r--ui-patch.c2
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
@@ -252,2 +252,4 @@ static void querystring_cb(const char *name, const char *value)
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
@@ -147,2 +147,3 @@ struct cgit_query {
int ssdiff;
+ int context;
char *vpath;
@@ -276,3 +277,3 @@ extern int cgit_diff_files(const unsigned char *old_sha1,
unsigned long *old_size, unsigned long *new_size,
- int *binary, linediff_fn fn);
+ int *binary, int context, linediff_fn fn);
diff --git a/shared.c b/shared.c
index 6e8f0ce..7cf1e59 100644
--- a/shared.c
+++ b/shared.c
@@ -264,3 +264,4 @@ 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)
{
@@ -287,3 +288,3 @@ int cgit_diff_files(const unsigned char *old_sha1,
diff_params.flags = XDF_NEED_MINIMAL;
- emit_params.ctxlen = 3;
+ emit_params.ctxlen = context > 0 ? context : 3;
emit_params.flags = XDL_EMIT_FUNCNAMES;
diff --git a/ui-diff.c b/ui-diff.c
index fb836df..d3a3b2c 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -129,3 +129,3 @@ static void inspect_filepair(struct diff_filepair *pair)
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) {
@@ -290,3 +290,3 @@ 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");
diff --git a/ui-log.c b/ui-log.c
index bfbe436..5eb5c81 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -35,3 +35,3 @@ void inspect_files(struct diff_filepair *pair)
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
@@ -73,3 +73,3 @@ 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");