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!
136 lines
4.1 KiB
Plaintext
136 lines
4.1 KiB
Plaintext
# vim: syn=sh:
|
|
for bc in 0 1
|
|
do
|
|
for gcw in 0 1
|
|
do
|
|
cd $TESTDIR
|
|
$TESTDIR/rollback || die "rollback failed"
|
|
|
|
name INTERNAL
|
|
editrc GL_WILDREPOS 1
|
|
editrc GL_BIG_CONFIG $bc
|
|
echo "\$GL_GITCONFIG_WILD = $gcw;" | addrc
|
|
|
|
# ----------
|
|
|
|
name "fail to set foo.bar"
|
|
echo "
|
|
@leads = u1 u2
|
|
@devs = u1 u2 u3 u4
|
|
|
|
@gbar = bar/..*
|
|
repo @gbar
|
|
C = @leads
|
|
RW+ = CREATOR
|
|
RW = @leads
|
|
config foo.bar = baz
|
|
" | ugc
|
|
expect "remote: git config foo.bar not allowed"
|
|
|
|
name "update rc file to allow foo.*"
|
|
catrc
|
|
cp ~/1 ~/junk
|
|
perl -pi -e 's/GL_GITCONFIG_KEYS = ""/GL_GITCONFIG_KEYS = "foo\\\\..*"/' ~/junk
|
|
cat ~/junk | runremote dd of=.gitolite.rc
|
|
catrc
|
|
expect "GL_GITCONFIG_KEYS.*foo"
|
|
|
|
name "ok to set foo.bar"
|
|
echo "
|
|
@leads = u1 u2
|
|
@devs = u1 u2 u3 u4
|
|
|
|
@gbar = bar/..*
|
|
repo @gbar
|
|
C = @leads
|
|
RW+ = CREATOR
|
|
RW = @leads
|
|
config foo.bar = baz
|
|
" | ugc -r
|
|
[ "$gcw" = "0" ] && expect "remote: git config set for bar/..\* but \$GL_GITCONFIG_WILD not set"
|
|
[ "$gcw" = "1" ] && notexpect "remote: git config set for bar/..\* but \$GL_GITCONFIG_WILD not set"
|
|
notexpect "git config.*not allowed"
|
|
expect_push_ok "master -> master"
|
|
|
|
[ "$gcw" = "0" ] && continue # the rest of these tests don't make sense now
|
|
|
|
name "fail to set foobar.baz"
|
|
echo "
|
|
@leads = u1 u2
|
|
@devs = u1 u2 u3 u4
|
|
|
|
@gbar = bar/..*
|
|
repo @gbar
|
|
C = @leads
|
|
RW+ = CREATOR
|
|
RW = @leads
|
|
config foo.bar = baz
|
|
config foobar.baz = ooka
|
|
" | ugc -r
|
|
expect "remote: git config foobar.baz not allowed"
|
|
|
|
name "u1 create bar/try1"
|
|
runlocal git ls-remote u1:bar/try1
|
|
expect "Initialized empty Git repository in $TEST_BASE_FULL/bar/try1.git/"
|
|
|
|
name "check u1 has foo.bar"
|
|
runremote cat $TEST_BASE/bar/try1.git/config
|
|
expect '^.foo'
|
|
expect 'bar = baz'
|
|
|
|
name "delete foo.bar"
|
|
echo "
|
|
@leads = u1 u2
|
|
@devs = u1 u2 u3 u4
|
|
|
|
@gbar = bar/..*
|
|
repo @gbar
|
|
C = @leads
|
|
RW+ = CREATOR
|
|
RW = @leads
|
|
config foo.bar =
|
|
" | ugc -r
|
|
expect_push_ok "master -> master"
|
|
|
|
name "check u1 doesnt have foo.bar"
|
|
runremote cat $TEST_BASE/bar/try1.git/config
|
|
expect '^.foo' # git leaves the section header behind
|
|
notexpect 'bar = baz'
|
|
|
|
name "u2 create bar/try2"
|
|
runlocal git ls-remote u2:bar/try2
|
|
expect "Initialized empty Git repository in $TEST_BASE_FULL/bar/try2.git/"
|
|
|
|
name "check u2 doesnt have foo.bar"
|
|
runremote cat $TEST_BASE/bar/try2.git/config
|
|
notexpect '^.foo' # but not here, since this repo never had the key at all
|
|
notexpect 'bar = baz'
|
|
|
|
name "add foo.frob retroactively"
|
|
echo "
|
|
@leads = u1 u2
|
|
@devs = u1 u2 u3 u4
|
|
|
|
@gbar = bar/..*
|
|
repo @gbar
|
|
C = @leads
|
|
RW+ = CREATOR
|
|
RW = @leads
|
|
config foo.frob = nitz
|
|
" | ugc -r
|
|
expect_push_ok "master -> master"
|
|
|
|
name "check u1 has foo.frob"
|
|
runremote cat $TEST_BASE/bar/try1.git/config
|
|
expect '^.foo'
|
|
expect 'frob = nitz'
|
|
|
|
name "check u2 has foo.frob"
|
|
runremote cat $TEST_BASE/bar/try2.git/config
|
|
expect '^.foo'
|
|
expect 'frob = nitz'
|
|
|
|
name INTERNAL
|
|
done
|
|
done
|