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

r8565:268d16b2 default
r9115:b55d4471 default
Show More
test-push-warn
126 lines | 2.0 KiB | text/plain | TextLexer
#!/bin/sh
mkdir a
cd a
hg init
echo foo > t1
hg add t1
hg commit -m "1" -d "1000000 0"
cd ..
hg clone a b
cd a
echo foo > t2
hg add t2
hg commit -m "2" -d "1000000 0"
cd ../b
echo foo > t3
hg add t3
hg commit -m "3" -d "1000000 0"
hg push ../a
hg pull ../a
hg push ../a
hg merge
hg commit -m "4" -d "1000000 0"
hg push ../a
cd ..
hg init c
cd c
for i in 0 1 2; do
echo $i >> foo
hg ci -Am $i -d "1000000 0"
done
cd ..
hg clone c d
cd d
for i in 0 1; do
hg co -C $i
echo d-$i >> foo
hg ci -m d-$i -d "1000000 0"
done
HGMERGE=true hg merge 3
hg ci -m c-d -d "1000000 0"
hg push ../c; echo $?
hg push -r 2 ../c; echo $?
hg push -r 3 ../c; echo $?
hg push -r 3 -r 4 ../c; echo $?
hg push -f -r 3 -r 4 ../c; echo $?
hg push -r 5 ../c; echo $?
# issue 450
hg init ../e
hg push -r 0 ../e ; echo $?
hg push -r 1 ../e ; echo $?
cd ..
# issue 736
echo % issue 736
hg init f
cd f
hg -q branch a
echo 0 > foo
hg -q ci -d "1000000 0" -Am 0
echo 1 > foo
hg -q ci -d "1000000 0" -m 1
hg -q up 0
echo 2 > foo
hg -q ci -d "1000000 0" -m 2
hg -q up 0
hg -q branch b
echo 3 > foo
hg -q ci -d "1000000 0" -m 3
cd ..
hg -q clone f g
cd g
echo % push on existing branch and new branch
hg -q up 1
echo 4 > foo
hg -q ci -d "1000000 0" -m 4
hg -q up 0
echo 5 > foo
hg -q branch c
hg -q ci -d "1000000 0" -m 5
hg push -r 4 -r 5 ../f; echo $?
echo % fail on multiple head push
hg -q up 1
echo 6 > foo
hg -q ci -d "1000000 0" -m 6
hg push -r 4 -r 6 ../f; echo $?
echo % push replacement head on existing branches
hg -q up 3
echo 7 > foo
hg -q ci -d "1000000 0" -m 7
hg push -r 6 -r 7 ../f; echo $?
echo % merge of branch a to other branch b followed by unrelated push on branch a
hg -q up 6
HGMERGE=true hg -q merge 7
hg -q ci -d "1000000 0" -m 8
hg -q up 7
echo 9 > foo
hg -q ci -d "1000000 0" -m 9
hg push -r 8 ../f; echo $?
hg push -r 9 ../f; echo $?
echo % cheating the counting algorithm
hg -q up 8
HGMERGE=true hg -q merge 2
hg -q ci -d "1000000 0" -m 10
hg -q up 1
echo 11 > foo
hg -q ci -d "1000000 0" -m 11
hg push -r 10 -r 11 ../f; echo $?
exit 0