tests: hide the name of the branch cache file

tests/test-inherit-mode

@@ -1,90 +1,90 b''
 #!/bin/sh
 
 # test that new files created in .hg inherit the permissions from .hg/store
 
 "$TESTDIR/hghave" unix-permissions || exit 80
 
 mkdir dir
 # just in case somebody has a strange $TMPDIR
 chmod g-s dir
 cd dir
 
 cat >printmodes.py <<EOF
 import os, sys
 
 allnames = []
 isdir = {}
 for root, dirs, files in os.walk(sys.argv[1]):
     for d in dirs:
 	name = os.path.join(root, d)
 	isdir[name] = 1
 	allnames.append(name)
     for f in files:
 	name = os.path.join(root, f)
 	allnames.append(name)
 allnames.sort()
 for name in allnames:
     suffix = name in isdir and '/' or ''
     print '%05o %s%s' % (os.lstat(name).st_mode & 07777, name, suffix)
 EOF
 
 cat >mode.py <<EOF
 import sys
 import os
 print '%05o' % os.lstat(sys.argv[1]).st_mode
 EOF
 
 umask 077
 
 hg init repo
 cd repo
 
 chmod 0770 .hg/store
 
 echo '% before commit'
 echo '% store can be written by the group, other files cannot'
 echo '% store is setgid'
 python ../printmodes.py .
 
 mkdir dir
 touch foo dir/bar
 hg ci -qAm 'add files'
 
 echo
 echo '% after commit'
 echo '% working dir files can only be written by the owner'
 echo '% files created in .hg can be written by the group'
-echo '% (in particular, store/**, dirstate, branch.cache, undo files)'
+echo '% (in particular, store/**, dirstate, branch cache file, undo files)'
 echo '% new directories are setgid'
 python ../printmodes.py .
 
 umask 007
 hg init ../push
 echo
 echo '% before push'
 echo '% group can write everything'
 python ../printmodes.py ../push
 
 umask 077
 hg -q push ../push
 echo
 echo '% after push'
 echo '% group can still write everything'
 python ../printmodes.py ../push
 
 # Test that we don't lose the setgid bit when we call chmod.
 # Not all systems support setgid directories (e.g. HFS+), so
 # just check that directories have the same mode.
 cd ..
 hg init setgid
 cd setgid
 chmod g+s .hg/store 2> /dev/null
 mkdir dir
 touch dir/file
 hg ci -qAm 'add dir/file'
 storemode=`python ../mode.py .hg/store`
 dirmode=`python ../mode.py .hg/store/data/dir`
 if [ "$storemode" != "$dirmode" ]; then
     echo "$storemode != $dirmode"
 fi
 

tests/test-inherit-mode.out

@@ -1,54 +1,54 b''
 % before commit
 % store can be written by the group, other files cannot
 % store is setgid
 00700 ./.hg/
 00600 ./.hg/00changelog.i
 00600 ./.hg/requires
 00770 ./.hg/store/
 
 % after commit
 % working dir files can only be written by the owner
 % files created in .hg can be written by the group
-% (in particular, store/**, dirstate, branch.cache, undo files)
+% (in particular, store/**, dirstate, branch cache file, undo files)
 % new directories are setgid
 00700 ./.hg/
 00600 ./.hg/00changelog.i
 00660 ./.hg/dirstate
 00600 ./.hg/requires
 00770 ./.hg/store/
 00660 ./.hg/store/00changelog.i
 00660 ./.hg/store/00manifest.i
 00770 ./.hg/store/data/
 00770 ./.hg/store/data/dir/
 00660 ./.hg/store/data/dir/bar.i
 00660 ./.hg/store/data/foo.i
 00660 ./.hg/store/undo
 00660 ./.hg/undo.branch
 00660 ./.hg/undo.dirstate
 00700 ./dir/
 00600 ./dir/bar
 00600 ./foo
 
 % before push
 % group can write everything
 00770 ../push/.hg/
 00660 ../push/.hg/00changelog.i
 00660 ../push/.hg/requires
 00770 ../push/.hg/store/
 
 % after push
 % group can still write everything
 00770 ../push/.hg/
 00660 ../push/.hg/00changelog.i
 00660 ../push/.hg/branch.cache
 00660 ../push/.hg/requires
 00770 ../push/.hg/store/
 00660 ../push/.hg/store/00changelog.i
 00660 ../push/.hg/store/00manifest.i
 00770 ../push/.hg/store/data/
 00770 ../push/.hg/store/data/dir/
 00660 ../push/.hg/store/data/dir/bar.i
 00660 ../push/.hg/store/data/foo.i
 00660 ../push/.hg/store/undo
 00660 ../push/.hg/undo.branch
 00660 ../push/.hg/undo.dirstate

tests/test-mq-caches

@@ -1,78 +1,78 b''
 #!/bin/sh
 
+branches=.hg/branch.cache
 echo '[extensions]' >> $HGRCPATH
 echo 'hgext.mq=' >> $HGRCPATH
 
 show_branch_cache()
 {
-    branches=.hg/branch.cache
     # force cache (re)generation
     hg log -r does-not-exist 2> /dev/null
     hg log -r tip --template 'tip: #rev#\n'
     if [ -f $branches ]; then
 	sort $branches
     else
-	echo No $branches
+	echo No branch cache
     fi
     if [ "$1" = 1 ]; then
 	for b in foo bar; do
 	    hg log -r $b --template "branch $b: "'#rev#\n'
 	done
     fi
 }
 
 hg init a
 cd a
 hg qinit -c
 
 echo '# mq patch on an empty repo'
 hg qnew p1
 show_branch_cache
 
 echo > pfile
 hg add pfile
 hg qrefresh -m 'patch 1'
 show_branch_cache
 
 echo
 echo '# some regular revisions'
 hg qpop
 echo foo > foo
 hg add foo
 echo foo > .hg/branch
 hg ci -m 'branch foo' -d '1000000 0'
 
 echo bar > bar
 hg add bar
 echo bar > .hg/branch
 hg ci -m 'branch bar' -d '1000000 0'
 show_branch_cache
 
 echo
 echo '# add some mq patches'
 hg qpush
 show_branch_cache
 
 hg qnew p2
 echo foo > .hg/branch
 echo foo2 >> foo
 hg qrefresh -m 'patch 2'
 show_branch_cache 1
 
 echo
 echo '# removing the cache'
-rm .hg/branch.cache
+rm $branches
 show_branch_cache 1
 
 echo
 echo '# importing rev 1 (the cache now ends in one of the patches)'
 hg qimport -r 1 -n p0
 show_branch_cache 1
 hg log -r qbase --template 'qbase: #rev#\n'
 
 echo
 echo '# detect an invalid cache'
 hg qpop -a
 hg qpush -a
 show_branch_cache
 

tests/test-mq-caches.out

@@ -1,53 +1,53 b''
 # mq patch on an empty repo
 tip: 0
-No .hg/branch.cache
+No branch cache
 tip: 0
-No .hg/branch.cache
+No branch cache
 
 # some regular revisions
 Patch queue now empty
 tip: 1
 3f910abad313ff802d3a23a7529433872df9b3ae 1
 3f910abad313ff802d3a23a7529433872df9b3ae bar
 9539f35bdc80732cc9a3f84e46508f1ed1ec8cff foo
 
 # add some mq patches
 applying p1
 Now at: p1
 tip: 2
 3f910abad313ff802d3a23a7529433872df9b3ae 1
 3f910abad313ff802d3a23a7529433872df9b3ae bar
 9539f35bdc80732cc9a3f84e46508f1ed1ec8cff foo
 tip: 3
 3f910abad313ff802d3a23a7529433872df9b3ae 1
 3f910abad313ff802d3a23a7529433872df9b3ae bar
 9539f35bdc80732cc9a3f84e46508f1ed1ec8cff foo
 branch foo: 3
 branch bar: 2
 
 # removing the cache
 tip: 3
 3f910abad313ff802d3a23a7529433872df9b3ae 1
 3f910abad313ff802d3a23a7529433872df9b3ae bar
 9539f35bdc80732cc9a3f84e46508f1ed1ec8cff foo
 branch foo: 3
 branch bar: 2
 
 # importing rev 1 (the cache now ends in one of the patches)
 tip: 3
 3f910abad313ff802d3a23a7529433872df9b3ae 1
 3f910abad313ff802d3a23a7529433872df9b3ae bar
 9539f35bdc80732cc9a3f84e46508f1ed1ec8cff foo
 branch foo: 3
 branch bar: 2
 qbase: 1
 
 # detect an invalid cache
 Patch queue now empty
 applying p0
 applying p1
 applying p2
 Now at: p2
 tip: 3
 9539f35bdc80732cc9a3f84e46508f1ed1ec8cff 0
 9539f35bdc80732cc9a3f84e46508f1ed1ec8cff foo

tests/test-newbranch

@@ -1,74 +1,76 b''
 #!/bin/sh
 
+branchcache=.hg/branch.cache
+
 hg init t
 cd t
 hg branches
 
 echo foo > a
 hg add a
 hg ci -m "initial" -d "1000000 0"
 hg branch foo
 hg branch
 hg ci -m "add branch name" -d "1000000 0"
 hg branch bar
 hg ci -m "change branch name" -d "1000000 0"
 echo % branch shadowing
 hg branch default
 hg branch -f default
 hg ci -m "clear branch name" -d "1000000 0"
 
 hg co foo
 hg branch
 echo bleah > a
 hg ci -m "modify a branch" -d "1000000 0"
 
 hg merge
 hg branch
 hg ci -m "merge" -d "1000000 0"
 hg log
 
 hg branches
 hg branches -q
 
 echo % test for invalid branch cache
 hg rollback
-cp .hg/branch.cache .hg/bc-invalid
+cp $branchcache .hg/bc-invalid
 hg log -r foo
-cp .hg/bc-invalid .hg/branch.cache
+cp .hg/bc-invalid $branchcache
 hg --debug log -r foo
-rm .hg/branch.cache
-echo corrupted > .hg/branch.cache
+rm $branchcache
+echo corrupted > $branchcache
 hg log -qr foo
-cat .hg/branch.cache
+cat $branchcache
 
 echo % push should update the branch cache
 hg init ../target
 echo % pushing just rev 0
 hg push -qr 0 ../target
-cat ../target/.hg/branch.cache
+cat ../target/$branchcache
 echo % pushing everything
 hg push -qf ../target
-cat ../target/.hg/branch.cache
+cat ../target/$branchcache
 
 echo % update with no arguments: tipmost revision of the current branch
 hg up -q -C 0
 hg up -q
 hg id
 hg up -q 1
 hg up -q
 hg id
 hg branch foobar
 hg up
 
 echo % fastforward merge
 hg branch ff
 echo ff > ff
 hg ci -Am'fast forward' -d '1000000 0'
 hg up foo
 hg merge ff
 hg branch
 hg commit -m'Merge ff into foo' -d '1000000 0'
 hg parents
 hg manifest
 
 exit 0