20 files changed, 334 insertions, 119 deletions

diff --git a/cgit.c b/cgit.c
index e498030..51ca78a 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"))
@@ -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."))
@@ -312,6 +329,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 +457,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);
@@ -447,6 +465,7 @@ static int prepare_repo_cmd(struct cgit_context *ctx)
                 cgit_print_docend();
                 return 1;
         }
+        cgit_prepare_repo_env(ctx->repo);
         return 0;
 }
 
@@ -458,6 +477,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 +487,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..bad66f0 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;
@@ -161,6 +165,7 @@ struct cgit_config {
         char *agefile;
         char *cache_root;
         char *clone_prefix;
+        char *clone_url;
         char *css;
         char *favicon;
         char *footer;
@@ -191,6 +196,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;
@@ -317,6 +323,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);
diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index 26c4bfc..4721c1e 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
@@ -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 an empty string.
+
+
 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
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 )