summaryrefslogtreecommitdiffabout
path: root/shared.c
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 /shared.c
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 (limited to 'shared.c') (more/less context) (show whitespace changes)
-rw-r--r--shared.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/shared.c b/shared.c
index 6e8f0ce..7cf1e59 100644
--- a/shared.c
+++ b/shared.c
@@ -257,17 +257,18 @@ int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf)
diffbuf = NULL;
buflen = 0;
}
return 0;
}
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;
xpparam_t diff_params;
xdemitconf_t emit_params;
xdemitcb_t emit_cb;
if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1))
return 1;
@@ -280,17 +281,17 @@ int cgit_diff_files(const unsigned char *old_sha1,
*binary = 1;
return 0;
}
memset(&diff_params, 0, sizeof(diff_params));
memset(&emit_params, 0, sizeof(emit_params));
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;
emit_cb.priv = fn;
xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb);
return 0;
}
void cgit_diff_tree(const unsigned char *old_sha1,