##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

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.
Alexis S. L. Carvalho - - Load All Authors

File last commit:

r4295:a7458602 default
r9115:b55d4471 default
Show More
test-merge6
45 lines | 742 B | text/plain | TextLexer
/ tests / test-merge6
History | Source | Raw |Copy content |Copy permalink
Thomas Arendsen Hein
Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.
 r800 #!/bin/sh
maf46@burn.cl.cam.ac.uk
Fix zombie files in merge...
 r616
Alexis S. L. Carvalho
test-merge6: avoid a shell script
 r4295 cat <<EOF > merge
import sys, os
print "merging for", os.path.basename(sys.argv[1])
maf46@burn.cl.cam.ac.uk
Fix zombie files in merge...
 r616 EOF
Alexis S. L. Carvalho
test-merge6: avoid a shell script
 r4295 HGMERGE="python ../merge"; export HGMERGE
maf46@burn.cl.cam.ac.uk
Fix zombie files in merge...
 r616
mkdir A1
cd A1
hg init
echo This is file foo1 > foo
echo This is file bar1 > bar
hg add foo bar
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
 r1933 hg commit -m "commit text" -d "1000000 0"
maf46@burn.cl.cam.ac.uk
Fix zombie files in merge...
 r616
cd ..
hg clone A1 B1
cd A1
rm bar
hg remove bar
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
 r1933 hg commit -m "commit test" -d "1000000 0"
maf46@burn.cl.cam.ac.uk
Fix zombie files in merge...
 r616
cd ../B1
echo This is file foo22 > foo
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
 r1933 hg commit -m "commit test" -d "1000000 0"
maf46@burn.cl.cam.ac.uk
Fix zombie files in merge...
 r616
cd ..
hg clone A1 A2
hg clone B1 B2
cd A1
hg pull ../B1
Vadim Gelfer
deprecate 'update -m'. use 'merge' instead.
 r2283 hg merge
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
 r1933 hg commit -m "commit test" -d "1000000 0"
maf46@burn.cl.cam.ac.uk
Fix zombie files in merge...
 r616 echo bar should remain deleted.
Matt Mackall
make manifest friendlier...
 r3736 hg manifest --debug
maf46@burn.cl.cam.ac.uk
Fix zombie files in merge...
 r616
cd ../B2
hg pull ../A2
Vadim Gelfer
deprecate 'update -m'. use 'merge' instead.
 r2283 hg merge
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
 r1933 hg commit -m "commit test" -d "1000000 0"
maf46@burn.cl.cam.ac.uk
Fix zombie files in merge...
 r616 echo bar should remain deleted.
Matt Mackall
make manifest friendlier...
 r3736 hg manifest --debug