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

r1785:81ca1a9b default
r9115:b55d4471 default
Show More
test-clone-pull-corruption
32 lines | 619 B | text/plain | TextLexer
/ tests / test-clone-pull-corruption
#!/bin/sh
#
# Corrupt an hg repo with a pull started during an aborted commit
#
# Create two repos, so that one of them can pull from the other one.
hg init source
cd source
touch foo
hg add foo
hg ci -m 'add foo'
hg clone . ../corrupted
echo >> foo
hg ci -m 'change foo'
# Add a hook to wait 5 seconds and then abort the commit
cd ../corrupted
echo '[hooks]' >> .hg/hgrc
echo 'pretxncommit = sleep 5; exit 1' >> .hg/hgrc
# start a commit...
touch bar
hg add bar
hg ci -m 'add bar' &
# ... and start a pull while the commit is still running
sleep 1
hg pull ../source 2>/dev/null
# see what happened
wait
hg verify