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 <johan@herland.net>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>

2 files changed, 23 insertions, 1 deletions

diff --git a/ui-diff.c b/ui-diff.c
index d3a3b2c..e0a72f7 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -111,103 +111,111 @@ static void print_fileinfo(struct fileinfo *info)
 static void count_diff_lines(char *line, int len)
 {
 	if (line && (len > 0)) {
 		if (line[0] == '+')
 			lines_added++;
 		else if (line[0] == '-')
 			lines_removed++;
 	}
 }
 
 static void inspect_filepair(struct diff_filepair *pair)
 {
 	int binary = 0;
 	unsigned long old_size = 0;
 	unsigned long new_size = 0;
 	files++;
 	lines_added = 0;
 	lines_removed = 0;
 	cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, &new_size,
 			&binary, 0, count_diff_lines);
 	if (files >= slots) {
 		if (slots == 0)
 			slots = 4;
 		else
 			slots = slots * 2;
 		items = xrealloc(items, slots * sizeof(struct fileinfo));
 	}
 	items[files-1].status = pair->status;
 	hashcpy(items[files-1].old_sha1, pair->one->sha1);
 	hashcpy(items[files-1].new_sha1, pair->two->sha1);
 	items[files-1].old_mode = pair->one->mode;
 	items[files-1].new_mode = pair->two->mode;
 	items[files-1].old_path = xstrdup(pair->one->path);
 	items[files-1].new_path = xstrdup(pair->two->path);
 	items[files-1].added = lines_added;
 	items[files-1].removed = lines_removed;
 	items[files-1].old_size = old_size;
 	items[files-1].new_size = new_size;
 	items[files-1].binary = binary;
 	if (lines_added + lines_removed > max_changes)
 		max_changes = lines_added + lines_removed;
 	total_adds += lines_added;
 	total_rems += lines_removed;
 }
 
 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("<div class='diffstat-header'>");
 	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("</div>");
 	html("<table summary='diffstat' class='diffstat'>");
 	max_changes = 0;
 	cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, prefix);
 	for(i = 0; i<files; i++)
 		print_fileinfo(&items[i]);
 	html("</table>");
 	html("<div class='diffstat-summary'>");
 	htmlf("%d files changed, %d insertions, %d deletions",
 	      files, total_adds, total_rems);
 	html("</div>");
 }
 
 
 /*
  * print a single line returned from xdiff
  */
 static void print_line(char *line, int len)
 {
 	char *class = "ctx";
 	char c = line[len-1];
 
 	if (line[0] == '+')
 		class = "add";
 	else if (line[0] == '-')
 		class = "del";
 	else if (line[0] == '@')
 		class = "hunk";
 
 	htmlf("<div class='%s'>", class);
 	line[len-1] = '\0';
 	html_txt(line);
 	html("</div>");
 	line[len-1] = c;
 }
 
 static void header(unsigned char *sha1, char *path1, int mode1,
 		   unsigned char *sha2, char *path2, int mode2)
 {
 	char *abbrev1, *abbrev2;
 	int subproject;
 
 	subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2));
 	html("<div class='head'>");
 	html("diff --git a/");
 	html_txt(path1);
 	html(" b/");
 	html_txt(path2);
diff --git a/ui-shared.c b/ui-shared.c
index e991799..c99bcec 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -296,137 +296,151 @@ void cgit_log_link(const char *name, const char *title, const char *class,
 	}
 	if (grep && pattern) {
 		html(delim);
 		html("qt=");
 		html_url_arg(grep);
 		delim = "&";
 		html(delim);
 		html("q=");
 		html_url_arg(pattern);
 	}
 	if (ofs > 0) {
 		html(delim);
 		html("ofs=");
 		htmlf("%d", ofs);
 		delim = "&";
 	}
 	if (showmsg) {
 		html(delim);
 		html("showmsg=1");
 	}
 	html("'>");
 	html_txt(name);
 	html("</a>");
 }
 
 void cgit_commit_link(char *name, const char *title, const char *class,
 		      const char *head, const char *rev, const char *path,
 		      int toggle_ssdiff)
 {
 	if (strlen(name) > ctx.cfg.max_msg_len && ctx.cfg.max_msg_len >= 15) {
 		name[ctx.cfg.max_msg_len] = '\0';
 		name[ctx.cfg.max_msg_len - 1] = '.';
 		name[ctx.cfg.max_msg_len - 2] = '.';
 		name[ctx.cfg.max_msg_len - 3] = '.';
 	}
 
 	char *delim;
 
 	delim = repolink(title, class, "commit", head, path);
 	if (rev && strcmp(rev, ctx.qry.head)) {
 		html(delim);
 		html("id=");
 		html_url_arg(rev);
 		delim = "&amp;";
 	}
 	if ((ctx.qry.ssdiff && !toggle_ssdiff) || (!ctx.qry.ssdiff && toggle_ssdiff)) {
 		html(delim);
 		html("ss=1");
+		delim = "&amp;";
+	}
+	if (ctx.qry.context > 0 && ctx.qry.context != 3) {
+		html(delim);
+		html("context=");
+		htmlf("%d", ctx.qry.context);
+		delim = "&amp;";
 	}
 	html("'>");
 	html_txt(name);
 	html("</a>");
 }
 
 void cgit_refs_link(const char *name, const char *title, const char *class,
 		    const char *head, const char *rev, const char *path)
 {
 	reporevlink("refs", name, title, class, head, rev, path);
 }
 
 void cgit_snapshot_link(const char *name, const char *title, const char *class,
 			const char *head, const char *rev,
 			const char *archivename)
 {
 	reporevlink("snapshot", name, title, class, head, rev, archivename);
 }
 
 void cgit_diff_link(const char *name, const char *title, const char *class,
 		    const char *head, const char *new_rev, const char *old_rev,
 		    const char *path, int toggle_ssdiff)
 {
 	char *delim;
 
 	delim = repolink(title, class, "diff", head, path);
 	if (new_rev && ctx.qry.head != NULL && strcmp(new_rev, ctx.qry.head)) {
 		html(delim);
 		html("id=");
 		html_url_arg(new_rev);
 		delim = "&amp;";
 	}
 	if (old_rev) {
 		html(delim);
 		html("id2=");
 		html_url_arg(old_rev);
 		delim = "&amp;";
 	}
 	if ((ctx.qry.ssdiff && !toggle_ssdiff) || (!ctx.qry.ssdiff && toggle_ssdiff)) {
 		html(delim);
 		html("ss=1");
+		delim = "&amp;";
+	}
+	if (ctx.qry.context > 0 && ctx.qry.context != 3) {
+		html(delim);
+		html("context=");
+		htmlf("%d", ctx.qry.context);
+		delim = "&amp;";
 	}
 	html("'>");
 	html_txt(name);
 	html("</a>");
 }
 
 void cgit_patch_link(const char *name, const char *title, const char *class,
 		     const char *head, const char *rev, const char *path)
 {
 	reporevlink("patch", name, title, class, head, rev, path);
 }
 
 void cgit_stats_link(const char *name, const char *title, const char *class,
 		     const char *head, const char *path)
 {
 	reporevlink("stats", name, title, class, head, NULL, path);
 }
 
 void cgit_self_link(char *name, const char *title, const char *class,
 		    struct cgit_context *ctx)
 {
 	if (!strcmp(ctx->qry.page, "repolist"))
 		return cgit_index_link(name, title, class, ctx->qry.search,
 				       ctx->qry.ofs);
 	else if (!strcmp(ctx->qry.page, "summary"))
 		return cgit_summary_link(name, title, class, ctx->qry.head);
 	else if (!strcmp(ctx->qry.page, "tag"))
 		return cgit_tag_link(name, title, class, ctx->qry.head,
 				     ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL);
 	else if (!strcmp(ctx->qry.page, "tree"))
 		return cgit_tree_link(name, title, class, ctx->qry.head,
 				      ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
 				      ctx->qry.path);
 	else if (!strcmp(ctx->qry.page, "plain"))
 		return cgit_plain_link(name, title, class, ctx->qry.head,
 				      ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
 				      ctx->qry.path);
 	else if (!strcmp(ctx->qry.page, "log"))
 		return cgit_log_link(name, title, class, ctx->qry.head,
 				      ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
 				      ctx->qry.path, ctx->qry.ofs,
 				      ctx->qry.grep, ctx->qry.search,
 				      ctx->qry.showmsg);
 	else if (!strcmp(ctx->qry.page, "commit"))
 		return cgit_commit_link(name, title, class, ctx->qry.head,
 				      ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
 				      ctx->qry.path, 0);
 	else if (!strcmp(ctx->qry.page, "patch"))