20 files changed, 317 insertions, 124 deletions

diff --git a/cgit.c b/cgit.c
index e498030..6be3754 100644
--- a/cgit.c
+++ b/cgit.c
@@ -26,14 +26,27 @@ void add_mimetype(const char *name, const char *value)
 	item->util = xstrdup(value);
 }
 
-struct cgit_filter *new_filter(const char *cmd, int extra_args)
+struct cgit_filter *new_filter(const char *cmd, filter_type filtertype)
 {
 	struct cgit_filter *f;
 	int args_size = 0;
+	int extra_args;
 
 	if (!cmd || !cmd[0])
 		return NULL;
 
+	switch (filtertype) {
+		case SOURCE:
+			extra_args = 1;
+			break;
+
+		case ABOUT:
+		case COMMIT:
+		default:
+			extra_args = 0;
+			break;
+	}
+
 	f = xmalloc(sizeof(struct cgit_filter));
 	f->cmd = xstrdup(cmd);
 	args_size = (2 + extra_args) * sizeof(char *);
@@ -83,11 +96,11 @@ void repo_config(struct cgit_repo *repo, const char *name, const char *value)
 		repo->logo_link = xstrdup(value);
 	else if (ctx.cfg.enable_filter_overrides) {
 		if (!strcmp(name, "about-filter"))
-			repo->about_filter = new_filter(value, 0);
+			repo->about_filter = new_filter(value, ABOUT);
 		else if (!strcmp(name, "commit-filter"))
-			repo->commit_filter = new_filter(value, 0);
+			repo->commit_filter = new_filter(value, COMMIT);
 		else if (!strcmp(name, "source-filter"))
-			repo->source_filter = new_filter(value, 1);
+			repo->source_filter = new_filter(value, SOURCE);
 	}
 }
 
@@ -147,6 +160,8 @@ void config_cb(const char *name, const char *value)
 		ctx.cfg.enable_filter_overrides = atoi(value);
 	else if (!strcmp(name, "enable-gitweb-owner"))
 		ctx.cfg.enable_gitweb_owner = atoi(value);
+	else if (!strcmp(name, "enable-http-clone"))
+		ctx.cfg.enable_http_clone = atoi(value);
 	else if (!strcmp(name, "enable-index-links"))
 		ctx.cfg.enable_index_links = atoi(value);
 	else if (!strcmp(name, "enable-commit-graph"))
@@ -178,9 +193,9 @@ void config_cb(const char *name, const char *value)
 	else if (!strcmp(name, "cache-dynamic-ttl"))
 		ctx.cfg.cache_dynamic_ttl = atoi(value);
 	else if (!strcmp(name, "about-filter"))
-		ctx.cfg.about_filter = new_filter(value, 0);
+		ctx.cfg.about_filter = new_filter(value, ABOUT);
 	else if (!strcmp(name, "commit-filter"))
-		ctx.cfg.commit_filter = new_filter(value, 0);
+		ctx.cfg.commit_filter = new_filter(value, COMMIT);
 	else if (!strcmp(name, "embedded"))
 		ctx.cfg.embedded = atoi(value);
 	else if (!strcmp(name, "max-atom-items"))
@@ -210,7 +225,7 @@ void config_cb(const char *name, const char *value)
 	else if (!strcmp(name, "section-from-path"))
 		ctx.cfg.section_from_path = atoi(value);
 	else if (!strcmp(name, "source-filter"))
-		ctx.cfg.source_filter = new_filter(value, 1);
+		ctx.cfg.source_filter = new_filter(value, SOURCE);
 	else if (!strcmp(name, "summary-log"))
 		ctx.cfg.summary_log = atoi(value);
 	else if (!strcmp(name, "summary-branches"))
@@ -312,6 +327,7 @@ static void prepare_context(struct cgit_context *ctx)
 	ctx->cfg.logo = "/cgit.png";
 	ctx->cfg.local_time = 0;
 	ctx->cfg.enable_gitweb_owner = 1;
+	ctx->cfg.enable_http_clone = 1;
 	ctx->cfg.enable_tree_linenumbers = 1;
 	ctx->cfg.max_repo_count = 50;
 	ctx->cfg.max_commit_count = 50;
@@ -439,7 +455,7 @@ static int prepare_repo_cmd(struct cgit_context *ctx)
 		tmp = xstrdup(ctx->qry.head);
 		ctx->qry.head = ctx->repo->defbranch;
 		ctx->page.status = 404;
-		ctx->page.statusmsg = "not found";
+		ctx->page.statusmsg = "Not found";
 		cgit_print_http_headers(ctx);
 		cgit_print_docstart(ctx);
 		cgit_print_pageheader(ctx);
@@ -458,6 +474,8 @@ static void process_request(void *cbdata)
 	cmd = cgit_get_cmd(ctx);
 	if (!cmd) {
 		ctx->page.title = "cgit error";
+		ctx->page.status = 404;
+		ctx->page.statusmsg = "Not found";
 		cgit_print_http_headers(ctx);
 		cgit_print_docstart(ctx);
 		cgit_print_pageheader(ctx);
@@ -466,6 +484,11 @@ static void process_request(void *cbdata)
 		return;
 	}
 
+	if (!ctx->cfg.enable_http_clone && cmd->is_clone) {
+		html_status(404, "Not found", 0);
+		return;
+	}
+
 	/* If cmd->want_vpath is set, assume ctx->qry.path contains a "virtual"
 	 * in-project path limit to be made available at ctx->qry.vpath.
 	 * Otherwise, no path limit is in effect (ctx->qry.vpath = NULL).
diff --git a/cgit.css b/cgit.css
index 1d90057..55afa94 100644
--- a/cgit.css
+++ b/cgit.css
@@ -331,6 +331,33 @@ table.commit-info {
 	margin-top: 1.5em;
 }
 
+div.cgit-panel {
+	float: right;
+	margin-top: 1.5em;
+}
+
+div.cgit-panel table {
+	border-collapse: collapse;
+	border: solid 1px #aaa;
+	background-color: #eee;
+}
+
+div.cgit-panel th {
+	text-align: center;
+}
+
+div.cgit-panel td {
+	padding: 0.25em 0.5em;
+}
+
+div.cgit-panel td.label {
+	padding-right: 0.5em;
+}
+
+div.cgit-panel td.ctrl {
+	padding-left: 0.5em;
+}
+
 table.commit-info th {
 	text-align: left;
 	font-weight: normal;
diff --git a/cgit.h b/cgit.h
index b5f00fc..caa9d8e 100644
--- a/cgit.h
+++ b/cgit.h
@@ -51,6 +51,10 @@ typedef void (*configfn)(const char *name, const char *value);
 typedef void (*filepair_fn)(struct diff_filepair *pair);
 typedef void (*linediff_fn)(char *line, int len);
 
+typedef enum {
+	ABOUT, COMMIT, SOURCE
+} filter_type;
+
 struct cgit_filter {
 	char *cmd;
 	char **argv;
@@ -191,6 +195,7 @@ struct cgit_config {
 	int embedded;
 	int enable_filter_overrides;
 	int enable_gitweb_owner;
+	int enable_http_clone;
 	int enable_index_links;
 	int enable_commit_graph;
 	int enable_log_filecount;
@@ -314,7 +319,7 @@ extern const char *cgit_repobasename(const char *reponame);
 
 extern int cgit_parse_snapshots_mask(const char *str);
 
-extern int cgit_open_filter(struct cgit_filter *filter);
+extern int cgit_open_filter(struct cgit_filter *filter, struct cgit_repo * repo);
 extern int cgit_close_filter(struct cgit_filter *filter);
 
 extern int readfile(const char *path, char **buf, size_t *size);
diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index 10b86f3..8e31578 100644
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -31,7 +31,7 @@ about-filter::
 	about pages (both top-level and for each repository). The command will
 	get the content of the about-file on its STDIN, and the STDOUT from the
 	command will be included verbatim on the about page. Default value:
-	none.
+	none. See also: "FILTER API".
 
 agefile::
 	Specifies a path, relative to each repository path, which can be used
@@ -81,6 +81,7 @@ commit-filter::
 	The command will get the message on its STDIN, and the STDOUT from the
 	command will be included verbatim as the commit message, i.e. this can
 	be used to implement bugtracker integration. Default value: none.
+	See also: "FILTER API".
 
 css::
 	Url which specifies the css document to include in all cgit pages.
@@ -105,6 +106,11 @@ enable-gitweb-owner::
 	for the git config value "gitweb.owner" to determine the owner.
 	Default value: "1". See also: scan-path.
 
+enable-http-clone::
+	If set to "1", cgit will act as an dumb HTTP endpoint for git clones.
+	If you use an alternate way of serving git repositories, you may wish
+	to disable this. Default value: "1".
+
 enable-index-links::
 	Flag which, when set to "1", will make cgit generate extra links for
 	each repo in the repository index (specifically, to the "summary",
@@ -320,7 +326,7 @@ source-filter::
 	and the name of the blob as its only command line argument. The STDOUT
 	from the command will be included verbatim as the blob contents, i.e.
 	this can be used to implement e.g. syntax highlighting. Default value:
-	none.
+	none. See also: "FILTER API".
 
 summary-branches::
 	Specifies the number of branches to display in the repository "summary"
@@ -353,7 +359,7 @@ REPOSITORY SETTINGS
 -------------------
 repo.about-filter::
 	Override the default about-filter. Default value: none. See also:
-	"enable-filter-overrides".
+	"enable-filter-overrides". See also: "FILTER API".
 
 repo.clone-url::
 	A list of space-separated urls which can be used to clone this repo.
@@ -361,7 +367,7 @@ repo.clone-url::
 
 repo.commit-filter::
 	Override the default commit-filter. Default value: none. See also:
-	"enable-filter-overrides".
+	"enable-filter-overrides". See also: "FILTER API".
 
 repo.defbranch::
 	The name of the default branch for this repository. If no such branch
@@ -432,7 +438,7 @@ repo.section::
 
 repo.source-filter::
 	Override the default source-filter. Default value: none. See also:
-	"enable-filter-overrides".
+	"enable-filter-overrides". See also: "FILTER API".
 
 repo.url::
 	The relative url used to access the repository. This must be the first
@@ -452,6 +458,42 @@ Note: the "repo." prefix is dropped from the option names in repo-specific
 config files, e.g. "repo.desc" becomes "desc".
 
 
+FILTER API
+----------
+- about filter::
+  This filter is given no arguments.
+  The about text that is to be filtered is available on standard input and the
+  filtered text is expected on standard output.
+- commit filter::
+  This filter is given no arguments.
+  The commit message text that is to be filtered is available on standard input
+  and the filtered text is expected on standard output.
+- source filter::
+  This filter is given a single parameter: the filename of the source file to
+  filter. The filter can use the filename to determine (for example) the syntax
+  highlighting mode.
+  The contents of the source file that is to be filtered is available on
+  standard input and the filtered contents is expected on standard output.
+
+Also, all filters are handed the following environment variables:
+- CGIT_REPO_URL        ( = repo.url       setting )
+- CGIT_REPO_NAME       ( = repo.name      setting )
+- CGIT_REPO_PATH       ( = repo.path      setting )
+- CGIT_REPO_OWNER      ( = repo.owner     setting )
+- CGIT_REPO_DEFBRANCH  ( = repo.defbranch setting )
+- CGIT_REPO_SECTION    ( = section        setting )
+- CGIT_REPO_CLONE_URL  ( = repo.clone-url setting )
+
+If a setting is not defined for a repository and the corresponding global
+setting is also not defined (if applicable), then the corresponding
+environment variable will be an empty string.
+
+Note that under normal circumstance all these environment variables are
+defined. If however the total size of the defined settings exceed the
+allocated buffer within cgit then only the environment variables that fit
+in the allocated buffer are handed to the filter.
+
+
 MACRO EXPANSION
 ---------------
 The following cgitrc options supports a simple macro expansion feature,
diff --git a/cmd.c b/cmd.c
index 536515b..5a3d157 100644
--- a/cmd.c
+++ b/cmd.c
@@ -56,7 +56,7 @@ static void commit_fn(struct cgit_context *ctx)
 
 static void diff_fn(struct cgit_context *ctx)
 {
-	cgit_print_diff(ctx->qry.sha1, ctx->qry.sha2, ctx->qry.path);
+	cgit_print_diff(ctx->qry.sha1, ctx->qry.sha2, ctx->qry.path, 1);
 }
 
 static void info_fn(struct cgit_context *ctx)
@@ -130,31 +130,31 @@ static void tree_fn(struct cgit_context *ctx)
 	cgit_print_tree(ctx->qry.sha1, ctx->qry.path);
 }
 
-#define def_cmd(name, want_repo, want_layout, want_vpath) \
-	{#name, name##_fn, want_repo, want_layout, want_vpath}
+#define def_cmd(name, want_repo, want_layout, want_vpath, is_clone) \
+	{#name, name##_fn, want_repo, want_layout, want_vpath, is_clone}
 
 struct cgit_cmd *cgit_get_cmd(struct cgit_context *ctx)
 {
 	static struct cgit_cmd cmds[] = {
-		def_cmd(HEAD, 1, 0, 0),
-		def_cmd(atom, 1, 0, 0),
-		def_cmd(about, 0, 1, 0),
-		def_cmd(blob, 1, 0, 0),
-		def_cmd(commit, 1, 1, 1),
-		def_cmd(diff, 1, 1, 1),
-		def_cmd(info, 1, 0, 0),
-		def_cmd(log, 1, 1, 1),
-		def_cmd(ls_cache, 0, 0, 0),
-		def_cmd(objects, 1, 0, 0),
-		def_cmd(patch, 1, 0, 1),
-		def_cmd(plain, 1, 0, 0),
-		def_cmd(refs, 1, 1, 0),
-		def_cmd(repolist, 0, 0, 0),
-		def_cmd(snapshot, 1, 0, 0),
-		def_cmd(stats, 1, 1, 1),
-		def_cmd(summary, 1, 1, 0),
-		def_cmd(tag, 1, 1, 0),
-		def_cmd(tree, 1, 1, 1),
+		def_cmd(HEAD, 1, 0, 0, 1),
+		def_cmd(atom, 1, 0, 0, 0),
+		def_cmd(about, 0, 1, 0, 0),
+		def_cmd(blob, 1, 0, 0, 0),
+		def_cmd(commit, 1, 1, 1, 0),
+		def_cmd(diff, 1, 1, 1, 0),
+		def_cmd(info, 1, 0, 0, 1),
+		def_cmd(log, 1, 1, 1, 0),
+		def_cmd(ls_cache, 0, 0, 0, 0),
+		def_cmd(objects, 1, 0, 0, 1),
+		def_cmd(patch, 1, 0, 1, 0),
+		def_cmd(plain, 1, 0, 0, 0),
+		def_cmd(refs, 1, 1, 0, 0),
+		def_cmd(repolist, 0, 0, 0, 0),
+		def_cmd(snapshot, 1, 0, 0, 0),
+		def_cmd(stats, 1, 1, 1, 0),
+		def_cmd(summary, 1, 1, 0, 0),
+		def_cmd(tag, 1, 1, 0, 0),
+		def_cmd(tree, 1, 1, 1, 0),
 	};
 	int i;
 
diff --git a/cmd.h b/cmd.h
index 8dc01bd..eb5bc87 100644
--- a/cmd.h
+++ b/cmd.h
@@ -8,7 +8,8 @@ struct cgit_cmd {
 	cgit_cmd_fn fn;
 	unsigned int want_repo:1,
 		want_layout:1,
-		want_vpath:1;
+		want_vpath:1,
+		is_clone:1;
 };
 
 extern struct cgit_cmd *cgit_get_cmd(struct cgit_context *ctx);
diff --git a/filters/commit-links.sh b/filters/commit-links.sh
index 110c609..d2cd2b3 100755
--- a/filters/commit-links.sh
+++ b/filters/commit-links.sh
@@ -3,6 +3,17 @@
 #
 # To use this script, refer to this file with either the commit-filter or the
 # repo.commit-filter options in cgitrc.
+#
+# The following environment variables can be used to retrieve the configuration
+# of the repository for which this script is called:
+# CGIT_REPO_URL        ( = repo.url       setting )
+# CGIT_REPO_NAME       ( = repo.name      setting )
+# CGIT_REPO_PATH       ( = repo.path      setting )
+# CGIT_REPO_OWNER      ( = repo.owner     setting )
+# CGIT_REPO_DEFBRANCH  ( = repo.defbranch setting )
+# CGIT_REPO_SECTION    ( = section        setting )
+# CGIT_REPO_CLONE_URL  ( = repo.clone-url setting )
+#
 
 # This expression generates links to commits referenced by their SHA1.
 regex=$regex'
diff --git a/filters/syntax-highlighting.sh b/filters/syntax-highlighting.sh
index 6b1c576..6283ce9 100755
--- a/filters/syntax-highlighting.sh
+++ b/filters/syntax-highlighting.sh
@@ -23,6 +23,17 @@
 # table.blob .kwb  { color:#830000; }
 # table.blob .kwc  { color:#000000; font-weight:bold; }
 # table.blob .kwd  { color:#010181; }
+#
+# The following environment variables can be used to retrieve the configuration
+# of the repository for which this script is called:
+# CGIT_REPO_URL        ( = repo.url       setting )
+# CGIT_REPO_NAME       ( = repo.name      setting )
+# CGIT_REPO_PATH       ( = repo.path      setting )
+# CGIT_REPO_OWNER      ( = repo.owner     setting )
+# CGIT_REPO_DEFBRANCH  ( = repo.defbranch setting )
+# CGIT_REPO_SECTION    ( = section        setting )
+# CGIT_REPO_CLONE_URL  ( = repo.clone-url setting )
+#
 
 # store filename and extension in local vars
 BASENAME="$1"
diff --git a/html.c b/html.c
index 24a03a5..eb1c25d 100644
--- a/html.c
+++ b/html.c
@@ -215,6 +215,14 @@ void html_option(const char *value, const char *text, const char *selected_value
 	html("</option>\n");
 }
 
+void html_intoption(int value, const char *text, int selected_value)
+{
+	htmlf("<option value='%d'%s>", value,
+	      value == selected_value ? " selected='selected'" : "");
+	html_txt(text);
+	html("</option>");
+}
+
 void html_link_open(const char *url, const char *title, const char *class)
 {
 	html("<a href='");
diff --git a/html.h b/html.h
index 1135fb8..20e1dc2 100644
--- a/html.h
+++ b/html.h
@@ -17,6 +17,7 @@ extern void html_url_path(const char *txt);
 extern void html_url_arg(const char *txt);
 extern void html_hidden(const char *name, const char *value);
 extern void html_option(const char *value, const char *text, const char *selected_value);
+extern void html_intoption(int value, const char *text, int selected_value);
 extern void html_link_open(const char *url, const char *title, const char *class);
 extern void html_link_close(void);
 extern void html_fileperm(unsigned short mode);
diff --git a/shared.c b/shared.c
index 3778a5b..be2ae59 100644
--- a/shared.c
+++ b/shared.c
@@ -7,6 +7,8 @@
  */
 
 #include "cgit.h"
+#include <stdio.h>
+#include <linux/limits.h>
 
 struct cgit_repolist cgit_repolist;
 struct cgit_context ctx;
@@ -367,7 +369,33 @@ int cgit_parse_snapshots_mask(const char *str)
 	return rv;
 }
 
-int cgit_open_filter(struct cgit_filter *filter)
+typedef struct {
+	char * name;
+	char * value;
+} cgit_env_var;
+
+static void prepare_env(struct cgit_repo * repo) {
+	cgit_env_var env_vars[] = {
+		{ .name = "CGIT_REPO_URL", .value = repo->url },
+		{ .name = "CGIT_REPO_NAME", .value = repo->name },
+		{ .name = "CGIT_REPO_PATH", .value = repo->path },
+		{ .name = "CGIT_REPO_OWNER", .value = repo->owner },
+		{ .name = "CGIT_REPO_DEFBRANCH", .value = repo->defbranch },
+		{ .name = "CGIT_REPO_SECTION", .value = repo->section },
+		{ .name = "CGIT_REPO_CLONE_URL", .value = repo->clone_url }
+	};
+	int env_var_count = ARRAY_SIZE(env_vars);
+	cgit_env_var *p, *q;
+	static char *warn = "cgit warning: failed to set env: %s=%s\n";
+
+	p = env_vars;
+	q = p + env_var_count;
+	for (; p < q; p++)
+		if (setenv(p->name, p->value, 1))
+			fprintf(stderr, warn, p->name, p->value);
+}
+
+int cgit_open_filter(struct cgit_filter *filter, struct cgit_repo * repo)
 {
 
 	filter->old_stdout = chk_positive(dup(STDOUT_FILENO),
@@ -378,6 +406,8 @@ int cgit_open_filter(struct cgit_filter *filter)
 		close(filter->pipe_fh[1]);
 		chk_non_negative(dup2(filter->pipe_fh[0], STDIN_FILENO),
 			"Unable to use pipe as STDIN");
+		if (repo)
+			prepare_env(repo);
 		execvp(filter->cmd, filter->argv);
 		die("Unable to exec subprocess %s: %s (%d)", filter->cmd,
 			strerror(errno), errno);
diff --git a/ui-commit.c b/ui-commit.c
index 2b4f677..a69dec6 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -39,7 +39,8 @@ void cgit_print_commit(char *hex, const char *prefix)
 	format_note(NULL, sha1, &notes, PAGE_ENCODING, 0);
 
 	load_ref_decorations(DECORATE_FULL_REFS);
-
+	
+	cgit_print_diff_ctrls();
 	html("<table summary='commit info' class='commit-info'>\n");
 	html("<tr><th>author</th><td>");
 	html_txt(info->author);
@@ -64,11 +65,6 @@ void cgit_print_commit(char *hex, const char *prefix)
 	cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp, prefix, 0);
 	html(" (");
 	cgit_patch_link("patch", NULL, NULL, NULL, tmp, prefix);
-	html(") (");
-	if ((ctx.qry.ssdiff && !ctx.cfg.ssdiff) || (!ctx.qry.ssdiff && ctx.cfg.ssdiff))
-		cgit_commit_link("unidiff", NULL, NULL, ctx.qry.head, tmp, prefix, 1);
-	else
-		cgit_commit_link("side-by-side diff", NULL, NULL, ctx.qry.head, tmp, prefix, 1);
 	html(")</td></tr>\n");
 	html("<tr><th>tree</th><td colspan='2' class='sha1'>");
 	tmp = xstrdup(hex);
@@ -110,7 +106,7 @@ void cgit_print_commit(char *hex, const char *prefix)
 	html("</table>\n");
 	html("<div class='commit-subject'>");
 	if (ctx.repo->commit_filter)
-		cgit_open_filter(ctx.repo->commit_filter);
+		cgit_open_filter(ctx.repo->commit_filter, ctx.repo);
 	html_txt(info->subject);
 	if (ctx.repo->commit_filter)
 		cgit_close_filter(ctx.repo->commit_filter);
@@ -118,7 +114,7 @@ void cgit_print_commit(char *hex, const char *prefix)
 	html("</div>");
 	html("<div class='commit-msg'>");
 	if (ctx.repo->commit_filter)
-		cgit_open_filter(ctx.repo->commit_filter);
+		cgit_open_filter(ctx.repo->commit_filter, ctx.repo);
 	html_txt(info->msg);
 	if (ctx.repo->commit_filter)
 		cgit_close_filter(ctx.repo->commit_filter);
@@ -127,7 +123,7 @@ void cgit_print_commit(char *hex, const char *prefix)
 		html("<div class='notes-header'>Notes</div>");
 		html("<div class='notes'>");
 		if (ctx.repo->commit_filter)
-			cgit_open_filter(ctx.repo->commit_filter);
+			cgit_open_filter(ctx.repo->commit_filter, ctx.repo);
 		html_txt(notes.buf);
 		if (ctx.repo->commit_filter)
 			cgit_close_filter(ctx.repo->commit_filter);
@@ -139,7 +135,7 @@ void cgit_print_commit(char *hex, const char *prefix)
 			tmp = sha1_to_hex(commit->parents->item->object.sha1);
 		else
 			tmp = NULL;
-		cgit_print_diff(ctx.qry.sha1, tmp, prefix);
+		cgit_print_diff(ctx.qry.sha1, tmp, prefix, 0);
 	}
 	strbuf_release(&notes);
 	cgit_free_commitinfo(info);
diff --git a/ui-diff.c b/ui-diff.c
index d21541b..868ceec 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -167,7 +167,7 @@ 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, save_context = ctx.qry.context;
+	int i;
 
 	html("<div class='diffstat-header'>");
 	cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.sha1,
@@ -177,19 +177,6 @@ void cgit_print_diffstat(const unsigned char *old_sha1,
 		html_txt(prefix);
 		html("')");
 	}
-	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(" (");
-	ctx.qry.ignorews = (ctx.qry.ignorews + 1) % 2;
-	cgit_self_link(ctx.qry.ignorews ? "ignore" : "show", NULL, NULL, &ctx);
-	ctx.qry.ignorews = (ctx.qry.ignorews + 1) % 2;
-	html(" whitespace changes)");
 	html("</div>");
 	html("<table summary='diffstat' class='diffstat'>");
 	max_changes = 0;
@@ -278,19 +265,6 @@ static void header(unsigned char *sha1, char *path1, int mode1,
 	html("</div>");
 }
 
-static void print_ssdiff_link()
-{
-	if (!strcmp(ctx.qry.page, "diff")) {
-		if (use_ssdiff)
-			cgit_diff_link("Unidiff", NULL, NULL, ctx.qry.head,
-				       ctx.qry.sha1, ctx.qry.sha2, ctx.qry.path, 1);
-		else
-			cgit_diff_link("Side-by-side diff", NULL, NULL,
-				       ctx.qry.head, ctx.qry.sha1,
-				       ctx.qry.sha2, ctx.qry.path, 1);
-	}
-}
-
 static void filepair_cb(struct diff_filepair *pair)
 {
 	unsigned long old_size = 0;
@@ -330,7 +304,56 @@ static void filepair_cb(struct diff_filepair *pair)
 		cgit_ssdiff_footer();
 }
 
-void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefix)
+void cgit_print_diff_ctrls()
+{
+	int i, curr;
+
+	html("<div class='cgit-panel'>");
+	html("<b>diff options</b>");
+	html("<form method='get' action='.'>");
+	cgit_add_hidden_formfields(1, 0, ctx.qry.page);
+	html("<table>");
+	html("<tr><td colspan='2'/></tr>");
+	html("<tr>");
+	html("<td class='label'>context:</td>");
+	html("<td class='ctrl'>");
+	html("<select name='context' onchange='this.form.submit();'>");
+	curr = ctx.qry.context;
+	if (!curr)
+		curr = 3;
+	for (i = 1; i <= 10; i++)
+		html_intoption(i, fmt("%d", i), curr);
+	for (i = 15; i <= 40; i += 5)
+		html_intoption(i, fmt("%d", i), curr);
+	html("</select>");
+	html("</td>");
+	html("</tr><tr>");
+	html("<td class='label'>space:</td>");
+	html("<td class='ctrl'>");
+	html("<select name='ignorews' onchange='this.form.submit();'>");
+	html_intoption(0, "include", ctx.qry.ignorews);
+	html_intoption(1, "ignore", ctx.qry.ignorews);
+	html("</select>");
+	html("</td>");
+	html("</tr><tr>");
+	html("<td class='label'>mode:</td>");
+	html("<td class='ctrl'>");
+	html("<select name='ss' onchange='this.form.submit();'>");
+	curr = ctx.qry.ssdiff;
+	if (!curr && ctx.cfg.ssdiff)
+		curr = 1;
+	html_intoption(0, "unified", curr);
+	html_intoption(1, "ssdiff", curr);
+	html("</select></td></tr>");
+	html("<tr><td/><td class='ctrl'>");
+	html("<noscript><input type='submit' value='reload'/></noscript>");
+	html("</td></tr></table>");
+	html("</form>");
+	html("</div>");
+}
+
+void cgit_print_diff(const char *new_rev, const char *old_rev,
+		     const char *prefix, int show_ctrls)
 {
 	enum object_type type;
 	unsigned long size;
@@ -373,7 +396,9 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefi
 	if ((ctx.qry.ssdiff && !ctx.cfg.ssdiff) || (!ctx.qry.ssdiff && ctx.cfg.ssdiff))
 		use_ssdiff = 1;
 
-	print_ssdiff_link();
+	if (show_ctrls)
+		cgit_print_diff_ctrls();
+
 	cgit_print_diffstat(old_rev_sha1, new_rev_sha1, prefix);
 
 	if (use_ssdiff) {
diff --git a/ui-diff.h b/ui-diff.h
index 12d0c62..0161ffb 100644
--- a/ui-diff.h
+++ b/ui-diff.h
@@ -1,11 +1,13 @@
 #ifndef UI_DIFF_H
 #define UI_DIFF_H
 
+extern void cgit_print_diff_ctrls();
+
 extern void cgit_print_diffstat(const unsigned char *old_sha1,
 				const unsigned char *new_sha1);
 
 extern void cgit_print_diff(const char *new_hex, const char *old_hex,
-			    const char *prefix);
+			    const char *prefix, int show_ctrls);
 
 extern struct diff_filespec *cgit_get_current_old_file(void);
 extern struct diff_filespec *cgit_get_current_new_file(void);
diff --git a/ui-log.c b/ui-log.c
index 15ed6a3..4a295bd 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -99,11 +99,10 @@ void print_commit(struct commit *commit, struct rev_info *revs)
 	struct strbuf graphbuf = STRBUF_INIT;
 	struct strbuf msgbuf = STRBUF_INIT;
 
-	if (ctx.repo->enable_log_filecount) {
+	if (ctx.repo->enable_log_filecount)
+		cols++;
+	if (ctx.repo->enable_log_linecount)
 		cols++;
-		if (ctx.repo->enable_log_linecount)
-			cols++;
-	}
 
 	if (revs->graph) {
 		/* Advance graph until current commit */
@@ -170,18 +169,18 @@ void print_commit(struct commit *commit, struct rev_info *revs)
 		cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
 	}
 
-	if (ctx.repo->enable_log_filecount) {
+	if (ctx.repo->enable_log_filecount || ctx.repo->enable_log_linecount) {
 		files = 0;
 		add_lines = 0;
 		rem_lines = 0;
 		cgit_diff_commit(commit, inspect_files, ctx.qry.vpath);
-		html("</td><td>");
-		htmlf("%d", files);
-		if (ctx.repo->enable_log_linecount) {
-			html("</td><td>");
-			htmlf("-%d/+%d", rem_lines, add_lines);
-		}
 	}
+
+	if (ctx.repo->enable_log_filecount)
+		htmlf("</td><td>%d", files);
+	if (ctx.repo->enable_log_linecount)
+		htmlf("</td><td>-%d/+%d", rem_lines, add_lines);
+
 	html("</td></tr>\n");
 
 	if (revs->graph || ctx.qry.showmsg) { /* Print a second table row */
@@ -370,10 +369,10 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
 	if (ctx.repo->enable_log_filecount) {
 		html("<th class='left'>Files</th>");
 		columns++;
-		if (ctx.repo->enable_log_linecount) {
-			html("<th class='left'>Lines</th>");
-			columns++;
-		}
+	}
+	if (ctx.repo->enable_log_linecount) {
+		html("<th class='left'>Lines</th>");
+		columns++;
 	}
 	html("</tr>\n");
 
diff --git a/ui-repolist.c b/ui-repolist.c
index e138f59..dce2eac 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -46,11 +46,20 @@ static int get_repo_modtime(const struct cgit_repo *repo, time_t *mtime)
 	}
 
 	path = fmt("%s/refs/heads/%s", repo->path, repo->defbranch);
-	if (stat(path, &s) == 0)
+	if (stat(path, &s) == 0) {
 		*mtime = s.st_mtime;
-	else
-		*mtime = 0;
+		r->mtime = *mtime;
+		return 1;
+	}
+
+	path = fmt("%s/%s", repo->path, "packed-refs");
+	if (stat(path, &s) == 0) {
+		*mtime = s.st_mtime;
+		r->mtime = *mtime;
+		return 1;
+	}
 
+	*mtime = 0;
 	r->mtime = *mtime;
 	return (r->mtime != 0);
 }
@@ -291,7 +300,7 @@ void cgit_print_site_readme()
 	if (!ctx.cfg.root_readme)
 		return;
 	if (ctx.cfg.about_filter)
-		cgit_open_filter(ctx.cfg.about_filter);
+		cgit_open_filter(ctx.cfg.about_filter, NULL);
 	html_include(ctx.cfg.root_readme);
 	if (ctx.cfg.about_filter)
 		cgit_close_filter(ctx.cfg.about_filter);
diff --git a/ui-snapshot.c b/ui-snapshot.c
index 07cc944..126779d 100644
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -19,7 +19,7 @@ static int write_compressed_tar_archive(struct archiver_args *args,const char *f
 	f.argv = malloc(2 * sizeof(char *));
 	f.argv[0] = f.cmd;
 	f.argv[1] = NULL;
-	cgit_open_filter(&f);
+	cgit_open_filter(&f, NULL);
 	rv = write_tar_archive(args);
 	cgit_close_filter(&f);
 	return rv;
diff --git a/ui-stats.c b/ui-stats.c
index 2a0c174..59f4c1e 100644
--- a/ui-stats.c
+++ b/ui-stats.c
@@ -386,6 +386,33 @@ void cgit_show_stats(struct cgit_context *ctx)
 	top = ctx->qry.ofs;
 	if (!top)
 		top = 10;
+
+	html("<div class='cgit-panel'>");
+	html("<b>stat options</b>");
+	html("<form method='get' action=''>");
+	cgit_add_hidden_formfields(1, 0, "stats");
+	html("<table><tr><td colspan='2'/></tr>");
+	if (ctx->repo->max_stats > 1) {
+		html("<tr><td class='label'>Period:</td>");
+		html("<td class='ctrl'><select name='period' onchange='this.form.submit();'>");
+		for (i = 0; i < ctx->repo->max_stats; i++)
+			html_option(fmt("%c", periods[i].code),
+				    periods[i].name, fmt("%c", period->code));
+		html("</select></td></tr>");
+	}
+	html("<tr><td class='label'>Authors:</td>");
+	html("<td class='ctrl'><select name='ofs' onchange='this.form.submit();'>");
+	html_intoption(10, "10", top);
+	html_intoption(25, "25", top);
+	html_intoption(50, "50", top);
+	html_intoption(100, "100", top);
+	html_intoption(-1, "all", top);
+	html("</select></td></tr>");
+	html("<tr><td/><td class='ctrl'>");
+	html("<noscript><input type='submit' value='Reload'/></noscript>");
+	html("</td></tr></table>");
+	html("</form>");
+	html("</div>");
 	htmlf("<h2>Commits per author per %s", period->name);
 	if (ctx->qry.path) {
 		html(" (path '");
@@ -393,30 +420,6 @@ void cgit_show_stats(struct cgit_context *ctx)
 		html("')");
 	}
 	html("</h2>");
-
-	html("<form method='get' action='' style='float: right; text-align: right;'>");
-	cgit_add_hidden_formfields(1, 0, "stats");
-	if (ctx->repo->max_stats > 1) {
-		html("Period: ");
-		html("<select name='period' onchange='this.form.submit();'>");
-		for (i = 0; i < ctx->repo->max_stats; i++)
-			htmlf("<option value='%c'%s>%s</option>",
-				periods[i].code,
-				period == &periods[i] ? " selected" : "",
-				periods[i].name);
-		html("</select><br/><br/>");
-	}
-	html("Authors: ");
-	html("");
-	html("<select name='ofs' onchange='this.form.submit();'>");
-	htmlf("<option value='10'%s>10</option>", top == 10 ? " selected" : "");
-	htmlf("<option value='25'%s>25</option>", top == 25 ? " selected" : "");
-	htmlf("<option value='50'%s>50</option>", top == 50 ? " selected" : "");
-	htmlf("<option value='100'%s>100</option>", top == 100 ? " selected" : "");
-	htmlf("<option value='-1'%s>All</option>", top == -1 ? " selected" : "");
-	html("</select>");
-	html("<noscript>&nbsp;&nbsp;<input type='submit' value='Reload'/></noscript>");
-	html("</form>");
 	print_authors(&authors, top, period);
 }
 
diff --git a/ui-summary.c b/ui-summary.c
index 5be2545..1e9a1b6 100644
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -113,7 +113,7 @@ void cgit_print_repo_readme(char *path)
 	 */
 	html("<div id='summary'>");
 	if (ctx.repo->about_filter)
-		cgit_open_filter(ctx.repo->about_filter);
+		cgit_open_filter(ctx.repo->about_filter, ctx.repo);
 	if (ref)
 		cgit_print_file(tmp, ref);
 	else
diff --git a/ui-tree.c b/ui-tree.c
index 442b6be..2d8d2f3 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -45,7 +45,7 @@ static void print_text_buffer(const char *name, char *buf, unsigned long size)
 	if (ctx.repo->source_filter) {
 		html("<td class='lines'><pre><code>");
 		ctx.repo->source_filter->argv[1] = xstrdup(name);
-		cgit_open_filter(ctx.repo->source_filter);
+		cgit_open_filter(ctx.repo->source_filter, ctx.repo);
 		html_raw(buf, size);
 		cgit_close_filter(ctx.repo->source_filter);
 		free(ctx.repo->source_filter->argv[1]);