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 --- ui-diff.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ui-diff.c') 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) -- cgit v1.2.3-2-gb3c3 From d20313e3daf855ee5d4808e050f54614c200d7b1 Mon Sep 17 00:00:00 2001 From: Johan Herland Date: Thu, 10 Jun 2010 20:15:51 +0200 Subject: ui-diff: Add links to increase/decrease number of context lines in diffs Add two links to the "Diffstat" line to show more/less context lines in the generated diff. To support this, cgit_commit_link() and cgit_diff_link() has learned to preserve the ctx.qry.context variable. Signed-off-by: Johan Herland Signed-off-by: Lars Hjemli --- ui-diff.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'ui-diff.c') diff --git a/ui-diff.c b/ui-diff.c index d3a3b2c..e0a72f7 100644 --- a/ui-diff.c +++ b/ui-diff.c @@ -156,13 +156,21 @@ static void inspect_filepair(struct diff_filepair *pair) void cgit_print_diffstat(const unsigned char *old_sha1, const unsigned char *new_sha1, const char *prefix) { - int i; + int i, save_context = ctx.qry.context; html("
"); cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.sha1, ctx.qry.sha2, NULL, 0); if (prefix) htmlf(" (limited to '%s')", prefix); + html(" ("); + ctx.qry.context = (save_context > 0 ? save_context : 3) << 1; + cgit_self_link("more", NULL, NULL, &ctx); + html("/"); + ctx.qry.context = (save_context > 3 ? save_context : 3) >> 1; + cgit_self_link("less", NULL, NULL, &ctx); + ctx.qry.context = save_context; + html(" context)"); html("
"); html(""); max_changes = 0; -- cgit v1.2.3-2-gb3c3