-rw-r--r-- | cgit.c | 2 | ||||
-rw-r--r-- | cgit.h | 3 | ||||
-rw-r--r-- | shared.c | 5 | ||||
-rw-r--r-- | ui-diff.c | 4 | ||||
-rw-r--r-- | ui-log.c | 2 | ||||
-rw-r--r-- | ui-patch.c | 2 |
6 files changed, 11 insertions, 7 deletions
@@ -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); } @@ -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); @@ -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; @@ -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"); @@ -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); } @@ -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"); |