Diff options
Diffstat (limited to '')
| -rw-r--r-- | cgit.c | 2 | |
| -rw-r--r-- | cgit.h | 1 | |
| -rw-r--r-- | cgitrc.5.txt | 17 | |
| -rw-r--r-- | shared.c | 1 | |
| -rwxr-xr-x | tests/setup.sh | 1 | |
| -rwxr-xr-x | tests/t0102-summary.sh | 6 | |
| -rw-r--r-- | ui-summary.c | 2 |
7 files changed, 26 insertions, 4 deletions
@@ -244,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.")) @@ -165,6 +165,7 @@ struct cgit_config { char *agefile; char *cache_root; char *clone_prefix; + char *clone_url; char *css; char *favicon; char *footer; diff --git a/cgitrc.5.txt b/cgitrc.5.txt index 9a9965b4..5ba81345 100644 --- a/cgitrc.5.txt +++ b/cgitrc.5.txt @@ -76,6 +76,11 @@ 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 @@ -363,7 +368,7 @@ repo.about-filter:: 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: @@ -511,6 +516,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 ------------------- @@ -520,8 +531,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 @@ -70,6 +70,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; } diff --git a/tests/setup.sh b/tests/setup.sh index b2f1169c..1e061078 100755 --- a/tests/setup.sh +++ b/tests/setup.sh @@ -62,6 +62,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 diff --git a/tests/t0102-summary.sh b/tests/t0102-summary.sh index f0b0d9a7..f299c5a4 100755 --- a/tests/t0102-summary.sh +++ b/tests/t0102-summary.sh @@ -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 diff --git a/ui-summary.c b/ui-summary.c index 5be2545c..227ed276 100644 --- a/ui-summary.c +++ b/ui-summary.c @@ -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>"); |