##// 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.
Steve Losh - - Load All Authors

File last commit:

r8902:b9a8b616 default
r9115:b55d4471 default
Show More
test-add
55 lines | 588 B | text/plain | TextLexer
/ tests / test-add
History | Source | Raw |Copy content |Copy permalink
Benoit Boissinot
make hg add of a removed file unremove the file...
 r5207 #!/bin/sh
hg init a
cd a
echo a > a
hg add -n
hg st
hg add
hg st
Steve Losh
Add a forget command for easily untracking files....
 r8902 hg forget a
hg add
hg st
Benoit Boissinot
make hg add of a removed file unremove the file...
 r5207
echo b > b
hg add -n b
hg st
Patrick Mezard
commands: add exits(1) if a specified file cannot be added (issue 891)
 r5688 hg add b || echo "failed to add b"
Benoit Boissinot
make hg add of a removed file unremove the file...
 r5207 hg st
echo % should fail
hg add b
hg st
hg ci -m 0
echo % should fail
hg add a
echo aa > a
hg ci -m 1
hg up 0
echo aaa > a
hg ci -m 2
hg merge
hg st
echo % should fail
hg add a
hg st
Stefano Tortarolo
make commit fail when committing unresolved files
 r6888 hg resolve -m a
Benoit Boissinot
make hg add of a removed file unremove the file...
 r5207 hg ci -m merge
echo % issue683
Steve Losh
Add a forget command for easily untracking files....
 r8902 hg forget a
hg add a
hg st
Benoit Boissinot
make hg add of a removed file unremove the file...
 r5207 hg rm a
hg st
echo a > a
hg add a
hg st
Patrick Mezard
commands: add exits(1) if a specified file cannot be added (issue 891)
 r5688
hg add c && echo "unexpected addition of missing file"
echo c > c
hg add d c && echo "unexpected addition of missing file"
hg st