##// END OF EJS Templates
inotify: server: new data structure to keep track of changes....
inotify: server: new data structure to keep track of changes. == Rationale for the new structure == Current structure was a dictionary tree. One directory was tracked as a dictionary: - keys: file/subdir name - values: - for a file, the status (a/r/m/...) - for a subdir, the directory representing the subdir It allowed efficient lookups, no matter of the type of the terminal leaf: for part in path.split('/'): tree = tree[part] However, there is no way to represent a directory and a file with the same name because keys are conflicting in the dictionary. Concrete example: Initial state: root dir |- foo (file) |- bar (file) # data state is: {'foo': 'n', 'bar': 'n'} Remove foo: root dir |- bar (file) # Data becomes {'foo': 'r'} until next commit. Add foo, as a directory, and foo/barbar file: root dir |- bar (file) |-> foo (dir) |- barbar (file) # New state should be represented as: {'foo': {'barbar': 'a'}, 'bar': 'n'} however, the key "foo" is already used and represents the old file. The dirstate: D foo A foo/barbar cannot be represented, hence the need for a new structure. == The new structure == 'directory' class. Represents one directory level. * Notable attributes: Two dictionaries: - 'files' Maps filename -> status for the current dir. - 'dirs' Maps subdir's name -> directory object representing the subdir * methods - walk(), formerly server.walk - lookup(), old server.lookup - dir(), old server.dir This new class allows embedding all the tree walks/lookups in its own class, instead of having everything mixed together in server. Incidently, since files and directories are not stored in the same dictionaries, we are solving the previous key conflict problem. The small drawback is that lookup operation is a bit more complex: for a path a/b/c/d/e we have to check twice the leaf, if e is a directory or a file.

File last commit:

r6301:68cfd7d2 default
r9115:b55d4471 default
Show More
test-inherit-mode
91 lines | 1.9 KiB | text/plain | TextLexer
#!/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