fix pull racing with push/commit (
issue1320)
changegroup() has a problem when nodes which does not descend from a node
in <bases> are added to remote after the discovery phase.
If that happens, changegroup() won't send the correct set of nodes, ie.
some nodes will be missing.
To correct it we have to find the set of nodes that both remote and self
have (called <common>), and send all the nodes not in <common>.
This fix has some overhead, in the worst case it will re-send a whole branch.
A proper fix to avoid this overhead might be to change the protocol so that
the <common> nodes are sent (instead of the <bases> of the missing nodes).
#!/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 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+rwx .hg/store
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