diff options
| author |   Johan Herland <johan@herland.net> | 2010-06-10 20:15:27 +0200 |
|---|---|---|
| committer |   Lars Hjemli <hjemli@gmail.com> | 2010-06-19 13:00:07 +0200 |
| commit | 6180e6169d6e87a3bea7e4da835dca17f93e5cfd (patch) | |
| tree | 7caa053b419c75081179cc4a6056ce6533d01d99 /shared.c | |
| parent | ui-shared.c: path-limit style nitpick (diff) | |
| download | cgit-6180e6169d6e87a3bea7e4da835dca17f93e5cfd.tar.xz cgit-6180e6169d6e87a3bea7e4da835dca17f93e5cfd.zip | |
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')
| -rw-r--r-- | shared.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -262,7 +262,8 @@ 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; xpparam_t diff_params; @@ -285,7 +286,7 @@ int cgit_diff_files(const unsigned char *old_sha1, 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; |