view tests/test-inherit-mode @ 10397:8cb81d75730c

mq: add parent node IDs to MQ patches on qrefresh/qnew

The goal of this patch is to add the IDs of the parents of applied MQ patches
into the patch file headers whenever qnew or qrefresh are run.

This will serve as a reminder of when the patches last applied cleanly and
will let us do more intelligent things in the future, such as:

    * Resolve conflicts found when qpushing to a new location by merging
      instead of simply showing rejects.

    * Display better diffs of versioned MQ patches because we can tell how the
      patched files have changed in the meantime.

Here are the new rules this patch introduces.  They are checked in this order:

    * If a patch currently has old, plain-style patch headers ("From:" and
      "Date:") do not change the style or add any new headers.

    * If the 'mq.plain' configuration setting is true, only plain-style
      headers will be used for all MQ patches.

    * qnew will initialize new patches with HG-style headers and fill in the
      "# Parent" header with the appropriate parent node.

    * qrefresh will refresh the "# Parent" header with the current parent of
      the current patch.

#!/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