try to fix test-inherit-mode on HFS+

HFS+ doesn't like setgid directories, so avoid them in most
of the test and do a quick check that doesn't change the
output when everything's OK.

tests/test-inherit-mode

@@ -1,68 +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
-chmod g+s .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 '% 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
-02770 ./.hg/store/
+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)
 % new directories are setgid
 00700 ./.hg/
 00600 ./.hg/00changelog.i
 00660 ./.hg/dirstate
 00600 ./.hg/requires
-02770 ./.hg/store/
+00770 ./.hg/store/
 00660 ./.hg/store/00changelog.i
 00660 ./.hg/store/00manifest.i
-02770 ./.hg/store/data/
-02770 ./.hg/store/data/dir/
+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