diff options
author | Lars Hjemli | 2011-06-06 20:49:13 +0000 |
---|---|---|
committer | Lars Hjemli | 2011-06-13 23:04:30 +0000 |
commit | a1429dbc89f9c0945e32cea9fd3424d2fe56aeab (patch) | |
tree | 78d1501781d72f0698f673e9c44450e32118d843 /ui-summary.c | |
parent | 3ec6b309505dc5f7ba14abe8861b02da34a9df0b (diff) | |
download | cgit-a1429dbc89f9c0945e32cea9fd3424d2fe56aeab.tar.gz cgit-a1429dbc89f9c0945e32cea9fd3424d2fe56aeab.tar.bz2 cgit-a1429dbc89f9c0945e32cea9fd3424d2fe56aeab.zip |
cgit.c: add 'clone-url' setting with support for macro expansion
The current 'clone-prefix' setting has some known issues:
* All repos get the same 'clone-prefix' value since the setting is not
adopted during repo registration (in cgitrc, or during scan-path traversal),
but only when the setting is used.
* The generated clone-urls for a repo is a combination of 'clone-prefix', a
slash and the repo url. This doesn't work well with e.g. ssh-style urls
like 'git@example.org:repo.git', since the inserted slash will make the
repo relative to the filesystem root.
* If 'remove-suffix' is enabled, the generated clone-urls will not work for
cloning (except for http-urls to cgit itself) since they miss the '.git'
suffix.
The new 'clone-url' setting is designed to avoid the mentioned issues:
* Each repo adopts the default 'clone-url' when the repo is defined. This
allows different groups of repos to adopt different values.
* The clone-urls for a repo is generated by expanding environment variables
in a string template without inserting arbitrary characters, hence any
kind of clone-url can be generated.
* Macro expansion also eases the 'remove-suffix' pain since it's now
possible to define e.g. 'clone-url=git://foo.org/$CGIT_REPO_URL.git' for
a set of repos. A furter improvement would be to define e.g.
$CGIT_REPO_SUFFIX to '.git' for all repos which had their url prettified,
or to store the original $CGIT_REPO_URL in e.g. $CGIT_REPO_REAL_URL before
suffix removal.
Reviewed-by: Ferry Huberts <mailings@hupie.com>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'ui-summary.c')
-rw-r--r-- | ui-summary.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui-summary.c b/ui-summary.c index 5be2545..227ed27 100644 --- a/ui-summary.c +++ b/ui-summary.c | |||
@@ -62,7 +62,7 @@ void cgit_print_summary() | |||
62 | NULL, NULL, 0, 0); | 62 | NULL, NULL, 0, 0); |
63 | } | 63 | } |
64 | if (ctx.repo->clone_url) | 64 | if (ctx.repo->clone_url) |
65 | print_urls(ctx.repo->clone_url, NULL); | 65 | print_urls(expand_macros(ctx.repo->clone_url), NULL); |
66 | else if (ctx.cfg.clone_prefix) | 66 | else if (ctx.cfg.clone_prefix) |
67 | print_urls(ctx.cfg.clone_prefix, ctx.repo->url); | 67 | print_urls(ctx.cfg.clone_prefix, ctx.repo->url); |
68 | html("</table>"); | 68 | html("</table>"); |