diff options
author | Lars Hjemli <hjemli@gmail.com> | 2011-06-07 05:49:13 (JST) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2011-06-14 08:04:30 (JST) |
commit | a1429dbc89f9c0945e32cea9fd3424d2fe56aeab (patch) | |
tree | 78d1501781d72f0698f673e9c44450e32118d843 /tests | |
parent | 3ec6b309505dc5f7ba14abe8861b02da34a9df0b (diff) | |
download | cgit-a1429dbc89f9c0945e32cea9fd3424d2fe56aeab.zip cgit-a1429dbc89f9c0945e32cea9fd3424d2fe56aeab.tar.gz |
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 'tests')
-rwxr-xr-x | tests/setup.sh | 1 | ||||
-rwxr-xr-x | tests/t0102-summary.sh | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/tests/setup.sh b/tests/setup.sh index b2f1169..1e06107 100755 --- a/tests/setup.sh +++ b/tests/setup.sh | |||
@@ -62,6 +62,7 @@ enable-log-linecount=1 | |||
62 | summary-log=5 | 62 | summary-log=5 |
63 | summary-branches=5 | 63 | summary-branches=5 |
64 | summary-tags=5 | 64 | summary-tags=5 |
65 | clone-url=git://example.org/\$CGIT_REPO_URL.git | ||
65 | 66 | ||
66 | repo.url=foo | 67 | repo.url=foo |
67 | repo.path=$PWD/trash/repos/foo/.git | 68 | repo.path=$PWD/trash/repos/foo/.git |
diff --git a/tests/t0102-summary.sh b/tests/t0102-summary.sh index f0b0d9a..f299c5a 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' | |||
9 | run_test 'find commit 5' 'grep -e "commit 5" trash/tmp' | 9 | run_test 'find commit 5' 'grep -e "commit 5" trash/tmp' |
10 | run_test 'find branch master' 'grep -e "master" trash/tmp' | 10 | run_test 'find branch master' 'grep -e "master" trash/tmp' |
11 | run_test 'no tags' '! grep -e "tags" trash/tmp' | 11 | run_test 'no tags' '! grep -e "tags" trash/tmp' |
12 | run_test 'clone-url expanded correctly' ' | ||
13 | grep -e "git://example.org/foo.git" trash/tmp | ||
14 | ' | ||
12 | 15 | ||
13 | run_test 'generate bar summary' 'cgit_url "bar" >trash/tmp' | 16 | run_test 'generate bar summary' 'cgit_url "bar" >trash/tmp' |
14 | run_test 'no commit 45' '! grep -e "commit 45" trash/tmp' | 17 | 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' | |||
16 | run_test 'find commit 50' 'grep -e "commit 50" trash/tmp' | 19 | run_test 'find commit 50' 'grep -e "commit 50" trash/tmp' |
17 | run_test 'find branch master' 'grep -e "master" trash/tmp' | 20 | run_test 'find branch master' 'grep -e "master" trash/tmp' |
18 | run_test 'no tags' '! grep -e "tags" trash/tmp' | 21 | run_test 'no tags' '! grep -e "tags" trash/tmp' |
22 | run_test 'clone-url expanded correctly' ' | ||
23 | grep -e "git://example.org/bar.git" trash/tmp | ||
24 | ' | ||
19 | 25 | ||
20 | tests_done | 26 | tests_done |