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

r9110:561ff8d9 default
r9115:b55d4471 default
Show More
test-mq-qgoto.out
31 lines | 504 B | text/plain | TextLexer
/ tests / test-mq-qgoto.out
Bryan O'Sullivan
mq: add qgoto command.
r4432 adding a
Mads Kiilerich
mq: qpop now tells which patches are popped...
r9110 popping c.patch
popping b.patch
Martin Geisler
mq: lowercase output...
r7627 now at: a.patch
Bryan O'Sullivan
mq: add qgoto command.
r4432 applying b.patch
applying c.patch
Martin Geisler
mq: lowercase output...
r7627 now at: c.patch
Mads Kiilerich
mq: qpop now tells which patches are popped...
r9110 popping c.patch
Martin Geisler
mq: lowercase output...
r7627 now at: b.patch
Jason Orendorff
mq: don't warn about ambiguous patch name when using patch index (issue1439)
r7568
% Using index
Mads Kiilerich
mq: qpop now tells which patches are popped...
r9110 popping b.patch
Martin Geisler
mq: lowercase output...
r7627 now at: a.patch
Jason Orendorff
mq: don't warn about ambiguous patch name when using patch index (issue1439)
r7568 applying b.patch
applying c.patch
Martin Geisler
mq: lowercase output...
r7627 now at: c.patch
Jason Orendorff
mq: don't warn about ambiguous patch name when using patch index (issue1439)
r7568
% No warnings when using index
Mads Kiilerich
mq: qpop now tells which patches are popped...
r9110 popping bug141421
popping bug314159
popping c.patch
Martin Geisler
mq: lowercase output...
r7627 now at: b.patch
Jason Orendorff
mq: don't warn about ambiguous patch name when using patch index (issue1439)
r7568 applying c.patch
applying bug314159
Martin Geisler
mq: lowercase output...
r7627 now at: bug314159
Jason Orendorff
mq: don't warn about ambiguous patch name when using patch index (issue1439)
r7568
% Detect ambiguous non-index
patch name "14" is ambiguous:
bug314159
bug141421
abort: patch 14 not in series