##// 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.
Stefano Tortarolo - - Load All Authors

File last commit:

r6888:7c36a4fb default
r9115:b55d4471 default
Show More
test-merge7
67 lines | 876 B | text/plain | TextLexer
/ tests / test-merge7
History | Source | Raw |Copy content |Copy permalink
Matt Mackall
Repair ancestor logic, fix up test cases
 r1351 #!/bin/sh
# initial
hg init test-a
cd test-a
cat >test.txt <<"EOF"
1
2
3
EOF
hg add test.txt
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
 r1933 hg commit -m "Initial" -d "1000000 0"
Matt Mackall
Repair ancestor logic, fix up test cases
 r1351
# clone
cd ..
hg clone test-a test-b
# change test-a
cd test-a
cat >test.txt <<"EOF"
one
two
three
EOF
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
 r1933 hg commit -m "Numbers as words" -d "1000000 0"
Matt Mackall
Repair ancestor logic, fix up test cases
 r1351
# change test-b
cd ../test-b
cat >test.txt <<"EOF"
1
2.5
3
EOF
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
 r1933 hg commit -m "2 -> 2.5" -d "1000000 0"
Matt Mackall
Repair ancestor logic, fix up test cases
 r1351
# now pull and merge from test-a
Matt Mackall
Make test-merge7 repeatable
 r1352 hg pull ../test-a
Alexis S. L. Carvalho
change tests to use simplemerge by default
 r4365 hg merge
Matt Mackall
Repair ancestor logic, fix up test cases
 r1351 # resolve conflict
cat >test.txt <<"EOF"
one
two-point-five
three
EOF
rm -f *.orig
Stefano Tortarolo
make commit fail when committing unresolved files
 r6888 hg resolve -m test.txt
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
 r1933 hg commit -m "Merge 1" -d "1000000 0"
Matt Mackall
Repair ancestor logic, fix up test cases
 r1351
# change test-a again
cd ../test-a
cat >test.txt <<"EOF"
one
two-point-one
three
EOF
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
 r1933 hg commit -m "two -> two-point-one" -d "1000000 0"
Matt Mackall
Repair ancestor logic, fix up test cases
 r1351
# pull and merge from test-a again
cd ../test-b
Matt Mackall
Make test-merge7 repeatable
 r1352 hg pull ../test-a
Alexis S. L. Carvalho
change tests to use simplemerge by default
 r4365 hg merge --debug
Matt Mackall
Repair ancestor logic, fix up test cases
 r1351
Alexis S. L. Carvalho
run-tests.py: pass -L/--label to simplemerge...
 r4387 cat test.txt
Matt Mackall
Repair ancestor logic, fix up test cases
 r1351
Benoit Boissinot
switch to the .hg/store layout, fix the tests
 r3853 hg debugindex .hg/store/data/test.txt.i
Matt Mackall
Repair ancestor logic, fix up test cases
 r1351
hg log