21 files changed, 339 insertions, 124 deletions

@@ -198,9 +198,9 @@ install-pdf: doc-pdf
         $(INSTALL) -m 0644 $(DOC_PDF) $(DESTDIR)$(pdfdir)
 
 uninstall:
-        rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
-        rm -f $(CGIT_DATA_PATH)/cgit.css
-        rm -f $(CGIT_DATA_PATH)/cgit.png
+        rm -f $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
+        rm -f $(DESTDIR)$(CGIT_DATA_PATH)/cgit.css
+        rm -f $(DESTDIR)$(CGIT_DATA_PATH)/cgit.png
 
 uninstall-doc: uninstall-man uninstall-html uninstall-pdf
 
@@ -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"))
@@ -229,6 +244,8 @@ void config_cb(const char *name, const char *value)
                 ctx.cfg.robots = xstrdup(value);
         else if (!strcmp(name, "clone-prefix"))
                 ctx.cfg.clone_prefix = xstrdup(value);
+        else if (!strcmp(name, "clone-url"))
+                ctx.cfg.clone_url = xstrdup(value);
         else if (!strcmp(name, "local-time"))
                 ctx.cfg.local_time = atoi(value);
         else if (!prefixcmp(name, "mimetype."))
@@ -313,6 +330,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;
@@ -444,7 +462,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);
@@ -452,6 +470,7 @@ static int prepare_repo_cmd(struct cgit_context *ctx)
                 cgit_print_docend();
                 return 1;
         }
+        cgit_prepare_repo_env(ctx->repo);
         return 0;
 }
 
@@ -463,6 +482,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);
@@ -471,6 +492,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).
@@ -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;
@@ -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;
@@ -162,6 +166,7 @@ struct cgit_config {
         char *agefile;
         char *cache_root;
         char *clone_prefix;
+        char *clone_url;
         char *css;
         char *favicon;
         char *footer;
@@ -192,6 +197,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;
@@ -318,6 +324,8 @@ extern int cgit_parse_snapshots_mask(const char *str);
 extern int cgit_open_filter(struct cgit_filter *filter);
 extern int cgit_close_filter(struct cgit_filter *filter);
 
+extern void cgit_prepare_repo_env(struct cgit_repo * repo);
+
 extern int readfile(const char *path, char **buf, size_t *size);
 
 extern char *expand_macros(const char *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
@@ -76,11 +76,17 @@ clone-prefix::
         setting is only used if `repo.clone-url` is unspecified. Default value:
         none.
 
+clone-url::
+        Space-separated list of clone-url templates. This setting is only
+        used if `repo.clone-url` is unspecified. Default value: none. See
+        also: "MACRO EXPANSION", "FILTER API".
+
 commit-filter::
         Specifies a command which will be invoked to format commit messages.
         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 +111,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 +331,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,15 +364,15 @@ 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.
-        Default value: none.
+        Default value: none. See also: "MACRO EXPANSION".
 
 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
@@ -438,7 +449,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
@@ -458,6 +469,40 @@ 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 (from repo.url)
+- CGIT_REPO_NAME (from repo.name)
+- CGIT_REPO_PATH (from repo.path)
+- CGIT_REPO_OWNER (from repo.owner)
+- CGIT_REPO_DEFBRANCH (from repo.defbranch)
+- CGIT_REPO_SECTION (from repo.section)
+- CGIT_REPO_CLONE_URL (from repo.clone-url)
+
+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 unset.
+
+
 MACRO EXPANSION
 ---------------
 The following cgitrc options supports a simple macro expansion feature,
@@ -477,6 +522,12 @@ can be accomplished by adding the following line to /etc/cgitrc:
 
         include=/etc/cgitrc.d/$HTTP_HOST
 
+The following options are expanded during request processing, and support
+the environment variables defined in "FILTER API":
+
+- clone-url
+- repo.clone-url
+
 
 EXAMPLE CGITRC FILE
 -------------------
@@ -486,8 +537,8 @@ EXAMPLE CGITRC FILE
 cache-size=1000
 
 
-# Specify some default clone prefixes
-clone-prefix=git://example.com ssh://example.com/pub/git http://example.com/git
+# Specify some default clone urls using macro expansion
+clone-url=git://foo.org/$CGIT_REPO_URL git@foo.org:$CGIT_REPO_URL
 
 # Specify the css url
 css=/css/cgit.css
@@ -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;
 
@@ -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);
@@ -3,12 +3,26 @@
 #
 # 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 )
+#
+
+regex=''
 
 # This expression generates links to commits referenced by their SHA1.
 regex=$regex'
-s|\b([0-9a-fA-F]{8,40})\b|<a href="./?id=\1">\1</a>|g'
+s|\b([0-9a-fA-F]{7,40})\b|<a href="./?id=\1">\1</a>|g'
+
 # This expression generates links to a fictional bugtracker.
 regex=$regex'
-s| #([0-9]+)\b|<a href="http://bugs.example.com/?bug=\1">#\1</a>|g'
+s|#([0-9]+)\b|<a href="http://bugs.example.com/?bug=\1">#\1</a>|g'
 
 sed -re "$regex"
@@ -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"
@@ -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='");
@@ -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);
@@ -7,6 +7,7 @@
  */
 
 #include "cgit.h"
+#include <stdio.h>
 
 struct cgit_repolist cgit_repolist;
 struct cgit_context ctx;
@@ -68,6 +69,7 @@ struct cgit_repo *cgit_add_repo(const char *url)
         ret->about_filter = ctx.cfg.about_filter;
         ret->commit_filter = ctx.cfg.commit_filter;
         ret->source_filter = ctx.cfg.source_filter;
+        ret->clone_url = ctx.cfg.clone_url;
         return ret;
 }
 
@@ -367,6 +369,33 @@ int cgit_parse_snapshots_mask(const char *str)
         return rv;
 }
 
+typedef struct {
+        char * name;
+        char * value;
+} cgit_env_var;
+
+void cgit_prepare_repo_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 (p->value && setenv(p->name, p->value, 1))
+                        fprintf(stderr, warn, p->name, p->value);
+}
+
 int cgit_open_filter(struct cgit_filter *filter)
 {
 
@@ -63,6 +63,7 @@ enable-log-linecount=1
 summary-log=5
 summary-branches=5
 summary-tags=5
+clone-url=git://example.org/\$CGIT_REPO_URL.git
 
 repo.url=foo
 repo.path=$PWD/trash/repos/foo/.git
@@ -9,6 +9,9 @@ run_test 'find commit 1' 'grep -e "commit 1" trash/tmp'
 run_test 'find commit 5' 'grep -e "commit 5" trash/tmp'
 run_test 'find branch master' 'grep -e "master" trash/tmp'
 run_test 'no tags' '! grep -e "tags" trash/tmp'
+run_test 'clone-url expanded correctly' '
+        grep -e "git://example.org/foo.git" trash/tmp
+'
 
 run_test 'generate bar summary' 'cgit_url "bar" >trash/tmp'
 run_test 'no commit 45' '! grep -e "commit 45" trash/tmp'
@@ -16,5 +19,8 @@ run_test 'find commit 46' 'grep -e "commit 46" trash/tmp'
 run_test 'find commit 50' 'grep -e "commit 50" trash/tmp'
 run_test 'find branch master' 'grep -e "master" trash/tmp'
 run_test 'no tags' '! grep -e "tags" trash/tmp'
+run_test 'clone-url expanded correctly' '
+        grep -e "git://example.org/bar.git" trash/tmp
+'
 
 tests_done
@@ -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);
@@ -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);
@@ -169,7 +169,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,
@@ -179,19 +179,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;
@@ -280,19 +267,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;
@@ -332,7 +306,54 @@ 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.has_ssdiff ? ctx.qry.ssdiff : ctx.cfg.ssdiff;
+        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;
@@ -374,7 +395,9 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefi
 
         use_ssdiff = ctx.qry.has_ssdiff ? ctx.qry.ssdiff : ctx.cfg.ssdiff;
 
-        print_ssdiff_link();
+        if (show_ctrls)
+                cgit_print_diff_ctrls();
+
         cgit_print_diffstat(old_rev_sha1, new_rev_sha1, prefix);
 
         if (use_ssdiff) {
@@ -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);
@@ -102,11 +102,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 */
@@ -173,18 +172,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 */
@@ -373,10 +372,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");
 
@@ -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);
 }
@@ -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);
 }
 
@@ -62,7 +62,7 @@ void cgit_print_summary()
                                NULL, NULL, 0, 0);
         }
         if (ctx.repo->clone_url)
-                print_urls(ctx.repo->clone_url, NULL);
+                print_urls(expand_macros(ctx.repo->clone_url), NULL);
         else if (ctx.cfg.clone_prefix)
                 print_urls(ctx.cfg.clone_prefix, ctx.repo->url);
         html("</table>");