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

r8523:5b7da468 default
r9115:b55d4471 default
Show More
test-bheads
113 lines | 1.4 KiB | text/plain | TextLexer
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 #!/bin/sh
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 heads()
{
Martin Geisler
tests: replace #...# syntax with {...}
r8523 hg heads --template '{rev}: {desc|firstline|strip}\n' "$@"
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 }
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 hg init a
cd a
echo 'root' >root
hg add root
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 hg commit -m "Adding root node"
heads
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 echo '-------'
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 heads .
Eric Hopper
Add option to heads to show only heads for current branch.
r4648
echo '======='
echo 'a' >a
hg add a
hg branch a
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 hg commit -m "Adding a branch"
heads
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 echo '-------'
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 heads .
Eric Hopper
Add option to heads to show only heads for current branch.
r4648
echo '======='
hg update -C 0
echo 'b' >b
hg add b
hg branch b
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 hg commit -m "Adding b branch"
heads
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 echo '-------'
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 heads .
Eric Hopper
Add option to heads to show only heads for current branch.
r4648
echo '======='
echo 'bh1' >bh1
hg add bh1
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 hg commit -m "Adding b branch head 1"
heads
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 echo '-------'
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 heads .
Eric Hopper
Add option to heads to show only heads for current branch.
r4648
echo '======='
hg update -C 2
echo 'bh2' >bh2
hg add bh2
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 hg commit -m "Adding b branch head 2"
heads
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 echo '-------'
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 heads .
Eric Hopper
Add option to heads to show only heads for current branch.
r4648
echo '======='
hg update -C 2
echo 'bh3' >bh3
hg add bh3
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 hg commit -m "Adding b branch head 3"
heads
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 echo '-------'
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 heads .
Eric Hopper
Add option to heads to show only heads for current branch.
r4648
echo '======='
hg merge 4
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 hg commit -m "Merging b branch head 2 and b branch head 3"
heads
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 echo '-------'
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 heads .
Eric Hopper
Add option to heads to show only heads for current branch.
r4648
echo '======='
echo 'c' >c
hg add c
hg branch c
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 hg commit -m "Adding c branch"
heads
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 echo '-------'
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 heads .
Eric Hopper
Add option to heads to show only heads for current branch.
r4648
echo '======='
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 heads -r 3 .
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 echo $?
echo '-------'
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 heads -r 2 .
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 echo $?
echo '-------'
hg update -C 4
echo $?
echo '-------'
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 heads -r 3 .
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 echo $?
echo '-------'
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 heads -r 2 .
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 echo $?
echo '-------'
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 heads -r 7 .
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 echo $?
echo '======='
for i in 0 1 2 3 4 5 6 7; do
hg update -C "$i"
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 heads
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 echo '-------'
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 heads .
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 echo '-------'
done
echo '======='
for i in a b c z; do
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 heads "$i"
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 echo '-------'
done
echo '======='
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 heads 0 1 2 3 4 5 6 7