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

r8803:2b35ced8 default
r9115:b55d4471 default
Show More
test-bisect
106 lines | 1.6 KiB | text/plain | TextLexer
Giorgos Keramidas
tests: new test for the bisect extension
r2924 #!/bin/sh
set -e
echo % init
hg init
echo % committing changes
count=0
echo > a
while test $count -lt 32 ; do
echo 'a' >> a
test $count -eq 0 && hg add
hg ci -m "msg $count" -d "$count 0"
echo % committed changeset $count
Danek Duvall
Solaris portability fixes
r2932 count=`expr $count + 1`
Giorgos Keramidas
tests: new test for the bisect extension
r2924 done
echo % log
hg log
echo % hg up -C
hg up -C
echo % bisect test
Matt Mackall
bisect: use more standard command syntax and help
r5735 hg bisect -r
hg bisect -b
hg bisect -g 1
hg bisect -g
Matt Mackall
bisect: improve tests...
r5777 echo skip
hg bisect -s
Matt Mackall
bisect: use more standard command syntax and help
r5735 hg bisect -g
hg bisect -g
hg bisect -b
hg bisect -g
Matt Mackall
bisect: handle search for bad to good transitions...
r5776
echo % bisect reverse test
hg bisect -r
hg bisect -b null
hg bisect -g tip
hg bisect -g
Matt Mackall
bisect: improve tests...
r5777 echo skip
hg bisect -s
Matt Mackall
bisect: handle search for bad to good transitions...
r5776 hg bisect -g
hg bisect -g
hg bisect -b
hg bisect -g
Matt Mackall
bisect: improve tests...
r5777
hg bisect -r
hg bisect -g tip
hg bisect -b tip || echo error
hg bisect -r
hg bisect -g null
hg bisect -bU tip
Bernhard Leiner
add additional bisect tests
r6860 hg id
Dirkjan Ochtman
bisect: only complain when nothing can be done
r6983 echo % reproduce AssertionError, issue1228 and issue1182
Bernhard Leiner
add additional bisect tests
r6860 hg bisect -r
hg bisect -b 4
hg bisect -g 0
hg bisect -s
hg bisect -s
hg bisect -s
Dirkjan Ochtman
bisect: only complain when nothing can be done
r6983 echo % reproduce non converging bisect, issue1182
Bernhard Leiner
add additional bisect tests
r6860 hg bisect -r
hg bisect -g 0
hg bisect -b 2
hg bisect -s
Dirkjan Ochtman
bisect: only complain when nothing can be done
r6983
echo % test no action
hg bisect -r
Benoit Boissinot
fix test-bisect error (because of set -e)
r6990 hg bisect || echo failure
Bernhard Leiner
Circumvent removal of valid bisect candidates due to previously skipped ones...
r7557
echo % reproduce AssertionError, issue1445
hg bisect -r
hg bisect -b 6
hg bisect -g 0
hg bisect -s
hg bisect -s
hg bisect -s
hg bisect -s
hg bisect -g
Patrick Mezard
bisect: fix traceback when command executable is not found
r8802
Patrick Mezard
test-bisect: test --command option
r8803 set +e
Patrick Mezard
bisect: fix traceback when command executable is not found
r8802 echo % test invalid command
hg bisect -r
hg bisect --command 'foobar'
Patrick Mezard
test-bisect: test --command option
r8803
echo % test bisecting command
cat > script.py <<EOF
#!/usr/bin/env python
import sys
from mercurial import ui, hg
repo = hg.repository(ui.ui(), '.')
if repo['.'].rev() < 6:
sys.exit(1)
EOF
chmod +x script.py
hg bisect -r
hg bisect --good tip
hg bisect --bad 0
hg bisect --command "`pwd`/script.py"
true