From 6180e6169d6e87a3bea7e4da835dca17f93e5cfd Mon Sep 17 00:00:00 2001 From: Johan Herland Date: Thu, 10 Jun 2010 20:15:27 +0200 Subject: 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 Signed-off-by: Lars Hjemli --- cgit.c | 2 ++ cgit.h | 3 ++- shared.c | 5 +++-- ui-diff.c | 4 ++-- ui-log.c | 2 +- ui-patch.c | 2 +- 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 @@ -250,6 +250,8 @@ static void querystring_cb(const char *name, const char *value) ctx.qry.period = xstrdup(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 @@ -145,6 +145,7 @@ struct cgit_query { char *sort; int showmsg; int ssdiff; + int context; char *vpath; }; @@ -274,7 +275,7 @@ extern void *cgit_free_commitinfo(struct commitinfo *info); 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, const unsigned char *new_sha1, diff --git a/shared.c b/shared.c index 6e8f0ce..7cf1e59 100644 --- a/shared.c +++ b/shared.c @@ -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; diff --git a/ui-diff.c b/ui-diff.c index fb836df..d3a3b2c 100644 --- a/ui-diff.c +++ b/ui-diff.c @@ -127,7 +127,7 @@ static void inspect_filepair(struct diff_filepair *pair) lines_added = 0; 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) slots = 4; @@ -288,7 +288,7 @@ static void filepair_cb(struct diff_filepair *pair) return; } 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) { if (use_ssdiff) diff --git a/ui-log.c b/ui-log.c index bfbe436..5eb5c81 100644 --- a/ui-log.c +++ b/ui-log.c @@ -33,7 +33,7 @@ void inspect_files(struct diff_filepair *pair) files++; 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); } void show_commit_decorations(struct commit *commit) diff --git a/ui-patch.c b/ui-patch.c index 25dc9fe..d13104c 100644 --- a/ui-patch.c +++ b/ui-patch.c @@ -71,7 +71,7 @@ static void filepair_cb(struct diff_filepair *pair) return; } 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) html("Binary files differ\n"); -- cgit