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!
96 lines
2.5 KiB
Plaintext
96 lines
2.5 KiB
Plaintext
# vim: syn=sh:
|
|
cd $TESTDIR
|
|
$TESTDIR/rollback || die "rollback failed"
|
|
editrc GL_BIG_CONFIG $1
|
|
# ----------
|
|
|
|
name "INTERNAL"
|
|
echo "
|
|
# group your projects/repos however you want
|
|
@u1r = r1a r1b
|
|
@u2r = r2a r2b
|
|
@u3r = r3a r3b
|
|
|
|
# the admin repo access was probably like this to start with:
|
|
repo gitolite-admin
|
|
RW = u1 u2 u3
|
|
RW+ NAME/ = tester
|
|
RW NAME/conf/fragments/u1r = u1
|
|
RW NAME/conf/fragments/u2r = u2
|
|
RW NAME/conf/fragments/u3r = u3
|
|
" | ugc
|
|
notexpect ABORT
|
|
|
|
name "tester push frag u1r"
|
|
cd ~/gitolite-admin
|
|
mkdir -p conf/fragments
|
|
echo "
|
|
repo @u1r
|
|
RW+ = tester
|
|
" > conf/fragments/u1r.conf
|
|
ugc < /dev/null
|
|
expect "create mode 100644 conf/fragments/u1r.conf"
|
|
expect "remote: Initialized empty Git repository in $TEST_BASE_FULL/r1a.git/"
|
|
|
|
expect "To gitolite:gitolite-admin"
|
|
expect "master -> master"
|
|
|
|
name "u1 push frag u1r"
|
|
cd ~/gitolite-admin
|
|
echo "
|
|
repo @u1r
|
|
RW+ = u5
|
|
" > conf/fragments/u1r.conf
|
|
ugc u1 < /dev/null
|
|
expect "To u1:gitolite-admin"
|
|
expect "master -> master"
|
|
|
|
name "u2 push main conf fail"
|
|
cd ~/gitolite-admin
|
|
echo "
|
|
repo @u1r
|
|
RW+ = u6
|
|
" | ugc u2
|
|
expect "W NAME/conf/gitolite.conf gitolite-admin u2 DENIED by fallthru"
|
|
expect "To u2:gitolite-admin"
|
|
expect "\[remote rejected\] master -> master (hook declined)"
|
|
git reset --hard origin/master &>/dev/null
|
|
|
|
name "u2 push frag u1r fail"
|
|
cd ~/gitolite-admin
|
|
echo "
|
|
repo @u1r
|
|
RW+ = u6
|
|
" > conf/fragments/u1r.conf
|
|
ugc u2 < /dev/null
|
|
expect "remote: W NAME/conf/fragments/u1r.conf gitolite-admin u2 DENIED by fallthru"
|
|
expect "To u2:gitolite-admin"
|
|
expect "\[remote rejected\] master -> master (hook declined)"
|
|
git reset --hard origin/master &>/dev/null
|
|
|
|
name "u3 set perms for r2a fail"
|
|
cd ~/gitolite-admin
|
|
echo "
|
|
repo r2a
|
|
RW+ = u6
|
|
" > conf/fragments/u3r.conf
|
|
ugc u3 < /dev/null
|
|
expect "u3r.conf attempting to set access for r2a"
|
|
git reset --hard origin/master &>/dev/null
|
|
|
|
name "u3 add r2b to u3r fail"
|
|
cd ~/gitolite-admin
|
|
echo "
|
|
@u3r = r2b
|
|
repo @u3r
|
|
RW+ = u6
|
|
" > conf/fragments/u3r.conf
|
|
ugc u3 < /dev/null
|
|
[[ $1 == 0 ]] && expect "u3r.conf attempting to set access for r2b"
|
|
[[ $1 == 1 ]] && expect "defining groups is not allowed inside fragments"
|
|
[[ $1 == 1 ]] && notexpect "u3r.conf attempting to set access for r2b"
|
|
[[ $1 == 0 ]] && notexpect "defining groups is not allowed inside fragments"
|
|
git reset --hard origin/master &>/dev/null
|
|
|
|
name INTERNAL
|