6539009cb5
$ENV{GL_REPO_BASE_ABS} is meant to point to the same directory as
$REPO_BASE, except it is meant to be passed to hooks, ADCs and other
child programs. And since you can't be sure where the child program
starts in, this became an absolute path.
Gradually, however, I started using it wherever I needed an absolute
path (mostly in code that jumps around various directories to do stuff).
Which is silly, because there's no reason $REPO_BASE cannot also be made
an absolute, even if the rc file has a relative path.
So that's what I did now: made $REPO_BASE absolute very early on, and
then systematically changed all uses of the longer form to the shorter
form when appropriate. And so the only thing we now use the longer one
for is to pass to child programs.
(Implementation note: The actual change is not very big, but while I was
about it I decided to make the test suite able to test with an absolute
REPO_BASE also, which is why the commit seems so large.)
----
This all started with a complaint from Damien Regad. He had an
extremely odd setup where his bashrc changed PWD to something other than
$HOME before anything else ran. This caused those two variables to
beceom inconsistent, and he had a 1-line fix he wanted me to apply.
I generally don't like making special fixes for for non-standard setups,
and anyway all he had to do was set the full path to REPO_BASE in the rc
file to get around this. Which is what I told him and he very politely
left it at that.
However, this did get me thinking, and I soon realised I was needlessly
conflating "relative versus absolute" with "able to be passed to child
programs". Fixing that solved his problem also, as a side-effect.
So I guess this is all thanks to Damien!
135 lines
5.4 KiB
Plaintext
135 lines
5.4 KiB
Plaintext
# vim: syn=sh:
|
|
for wr in 0 1
|
|
do
|
|
for bc in 0 1
|
|
do
|
|
for ais in 0 1
|
|
do
|
|
cd $TESTDIR
|
|
$TESTDIR/rollback || die "rollback failed"
|
|
editrc GL_WILDREPOS $wr
|
|
editrc GL_BIG_CONFIG $bc
|
|
echo "\$GL_ALL_INCLUDES_SPECIAL = $ais;" | addrc
|
|
|
|
# ----------
|
|
name "INTERNAL"
|
|
echo|ugc
|
|
name "daemon access for testing repo"
|
|
runremote ls -al $TEST_BASE/testing.git/git-daemon-export-ok
|
|
[ "$ais" = "0" ] && expect "ls: cannot access $TEST_BASE/testing.git/git-daemon-export-ok: No such file or directory"
|
|
[ "$ais" = "1" ] && expect "gitolite-test gitolite-test .* $TEST_BASE/testing.git/git-daemon-export-ok"
|
|
|
|
name "INTERNAL"
|
|
echo "
|
|
@leads = u1 u2
|
|
@devs = u1 u2 u3 u4
|
|
|
|
@gbar = bar
|
|
repo @gbar
|
|
RW+ = @leads
|
|
RW = @devs
|
|
" | ugc
|
|
expect_push_ok "master -> master"
|
|
runremote ls -al $TEST_BASE/bar.git/git-daemon-export-ok
|
|
expect "ls: cannot access $TEST_BASE/bar.git/git-daemon-export-ok: No such file or directory"
|
|
runremote ls -al projects.list
|
|
[ "$ais" = "0" ] && expect "gitolite-test gitolite-test 0 .* projects.list"
|
|
[ "$ais" = "1" ] && expect "gitolite-test gitolite-test 12 .* projects.list"
|
|
runremote cat projects.list
|
|
[ "$ais" = "0" ] && notexpect "testing.git"
|
|
[ "$ais" = "1" ] && expect "testing.git"
|
|
|
|
name "add daemon access to bar"
|
|
echo "
|
|
R = daemon
|
|
" | ugc
|
|
runremote ls -al $TEST_BASE/bar.git/git-daemon-export-ok
|
|
expect "gitolite-test gitolite-test .* $TEST_BASE/bar.git/git-daemon-export-ok"
|
|
runremote ls -al projects.list
|
|
[ "$ais" = "0" ] && expect "gitolite-test gitolite-test 0 .* projects.list"
|
|
[ "$ais" = "1" ] && expect "gitolite-test gitolite-test 12 .* projects.list"
|
|
|
|
name "add foo with gitweb access"
|
|
echo "
|
|
@leads = u1 u2
|
|
@devs = u1 u2 u3 u4
|
|
|
|
@gfoo = foo
|
|
repo @gfoo
|
|
RW+ = @leads
|
|
RW = @devs
|
|
R = gitweb
|
|
" | ugc
|
|
expect_push_ok "master -> master"
|
|
runremote ls -al projects.list
|
|
[ "$ais" = "0" ] && expect "gitolite-test gitolite-test 8 .* projects.list"
|
|
[ "$ais" = "1" ] && expect "gitolite-test gitolite-test 20 .* projects.list"
|
|
runremote cat projects.list
|
|
[ "$ais" = "0" ] && notexpect "testing.git"
|
|
[ "$ais" = "1" ] && expect "testing.git"
|
|
expect "foo.git"
|
|
|
|
name "add gitweb access to bar"
|
|
echo "
|
|
repo @gbar
|
|
R = gitweb
|
|
" | ugc
|
|
expect_push_ok "master -> master"
|
|
runremote ls -al projects.list
|
|
[ "$ais" = "0" ] && expect "gitolite-test gitolite-test 16 .* projects.list"
|
|
[ "$ais" = "1" ] && expect "gitolite-test gitolite-test 28 .* projects.list"
|
|
runremote cat projects.list
|
|
[ "$ais" = "0" ] && notexpect "testing.git"
|
|
[ "$ais" = "1" ] && expect "testing.git"
|
|
expect "foo.git"
|
|
expect "bar.git"
|
|
|
|
name "add repo baz with description"
|
|
echo "
|
|
@gbaz = baz
|
|
repo @gbaz
|
|
RW = @leads
|
|
|
|
baz = \"this is repo baz\"
|
|
" | ugc
|
|
expect_push_ok "master -> master"
|
|
expect "remote: Initialized empty Git repository in $TEST_BASE_FULL/baz.git/"
|
|
runremote ls -al projects.list
|
|
[ "$ais" = "0" ] && expect "gitolite-test gitolite-test 24 .* projects.list"
|
|
[ "$ais" = "1" ] && expect "gitolite-test gitolite-test 36 .* projects.list"
|
|
runremote cat projects.list
|
|
[ "$ais" = "0" ] && notexpect "testing.git"
|
|
[ "$ais" = "1" ] && expect "testing.git"
|
|
expect "foo.git"
|
|
expect "bar.git"
|
|
expect "baz.git"
|
|
runremote ls -al $TEST_BASE/baz.git/description
|
|
expect "gitolite-test gitolite-test 17 .* $TEST_BASE/baz.git/description"
|
|
runremote cat $TEST_BASE/baz.git/description
|
|
expect "this is repo baz"
|
|
|
|
name "add owner to testing repo"
|
|
echo "
|
|
testing \"sitaram\" = \"this is the testing repo\"
|
|
" | ugc
|
|
expect_push_ok "master -> master"
|
|
runremote ls -al projects.list
|
|
expect "gitolite-test gitolite-test 36 .* projects.list"
|
|
runremote cat projects.list
|
|
expect "testing.git"
|
|
expect "foo.git"
|
|
expect "bar.git"
|
|
expect "baz.git"
|
|
runremote cat $TEST_BASE/testing.git/config
|
|
expect "\[gitweb\]"
|
|
expect "owner = sitaram"
|
|
runremote ls -al $TEST_BASE/testing.git/description
|
|
expect "gitolite-test gitolite-test 25 .* $TEST_BASE/testing.git/description"
|
|
runremote cat $TEST_BASE/testing.git/description
|
|
expect "this is the testing repo"
|
|
|
|
name INTERNAL
|
|
done
|
|
done
|
|
done
|