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!
82 lines
2 KiB
Plaintext
82 lines
2 KiB
Plaintext
# vim: syn=sh:
|
|
# this is the specific example in commit 32056e0
|
|
for bc in 0 1
|
|
do
|
|
cd $TESTDIR
|
|
$TESTDIR/rollback || die "rollback failed"
|
|
editrc GL_WILDREPOS 1
|
|
editrc GL_BIG_CONFIG $bc
|
|
|
|
name "INTERNAL"
|
|
echo "
|
|
@private-owners = u1 u2
|
|
@experienced-private-owners = u3 u4
|
|
|
|
repo CREATOR/.*
|
|
C = @private-owners @experienced-private-owners
|
|
RWD = CREATOR
|
|
RW = WRITERS
|
|
R = READERS
|
|
- = @private-owners
|
|
RW+D = CREATOR
|
|
" | ugc
|
|
name "nothing set yet"
|
|
expect_push_ok "master -> master"
|
|
|
|
cd ~/td
|
|
runlocal git clone u1:u1/r1
|
|
expect "Initialized empty Git repository in $TEST_BASE_FULL/u1/r1.git/"
|
|
cd r1
|
|
mdc r1file1
|
|
runlocal git push origin master
|
|
runlocal git checkout -b br1
|
|
mdc r1file2
|
|
mdc r1file3
|
|
|
|
name "u1 create branch"
|
|
runlocal git push origin br1
|
|
expect "\* \[new branch\] br1 -> br1"
|
|
expect_push_ok "br1 -> br1"
|
|
|
|
name "u1 rewind branch"
|
|
runlocal git reset --hard HEAD^
|
|
mdc r1file4
|
|
runlocal git push origin +br1
|
|
expect "remote: + refs/heads/br1 u1 DENIED by refs/"
|
|
expect "remote: error: hook declined to update refs/heads/br1"
|
|
|
|
name "u1 delete branch"
|
|
runlocal git push origin :br1
|
|
expect "\[deleted\] br1"
|
|
|
|
cd ~/td
|
|
rm -rf r1
|
|
runlocal git clone u3:u3/r1
|
|
expect "Initialized empty Git repository in $TEST_BASE_FULL/u3/r1.git/"
|
|
cd r1
|
|
mdc r1file1
|
|
runlocal git push origin master
|
|
runlocal git checkout -b br1
|
|
mdc r1file2
|
|
mdc r1file3
|
|
|
|
name "u3 create branch"
|
|
runlocal git push origin br1
|
|
expect "\* \[new branch\] br1 -> br1"
|
|
expect_push_ok "br1 -> br1"
|
|
|
|
name "u3 rewind branch"
|
|
runlocal git reset --hard HEAD^
|
|
mdc r1file4
|
|
runlocal git push origin +br1
|
|
expect "To u3:u3/r1"
|
|
expect "+ .......\.\.\........ br1 -> br1 (forced update)"
|
|
|
|
name "u3 delete branch"
|
|
runlocal git push origin :br1
|
|
expect "\[deleted\] br1"
|
|
|
|
name "INTERNAL"
|
|
|
|
done
|