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

r6479:31abcae3 default
r9115:b55d4471 default
Show More
test-hgignore.out
59 lines | 540 B | text/plain | TextLexer
/ tests / test-hgignore.out
Patrick Mezard
Test issue 562: .hgignore requires newline at end
r4439 % should display baz only
? baz
Benoit Boissinot
add a test for hgignore
r1478 --
A dir/b.o
? a.c
? a.o
? dir/c.o
? syntax
--
Thomas Arendsen Hein
Adjusted test output to match new hgignore error messages.
r1612 abort: .hgignore: invalid pattern (relre): *.o
Benoit Boissinot
add a test for hgignore
r1478 --
A dir/b.o
? .hgignore
? a.c
? syntax
--
Thomas Arendsen Hein
Fix re: and glob: patterns in .hgignore (reported by Brad Schick)...
r5029 A dir/b.o
Patrick Mezard
dirstate: do not ignore current directory '.' (issue 1078)
r6479 ? a.c
? a.o
? dir/c.o
? syntax
--
A dir/b.o
Thomas Arendsen Hein
Fix re: and glob: patterns in .hgignore (reported by Brad Schick)...
r5029 ? .hgignore
? a.c
? syntax
--
A dir/b.o
? .hgignore
? a.c
? syntax
--
A dir/b.o
? .hgignore
? a.c
? syntax
--
Thomas Arendsen Hein
Adjusted test output to match new hgignore error messages.
r1612 .hgignore: ignoring invalid syntax 'invalid'
Benoit Boissinot
add a test for hgignore
r1478 A dir/b.o
? .hgignore
? a.c
? a.o
? dir/c.o
? syntax
--
A dir/b.o
? .hgignore
? a.c
? syntax
--
A dir/b.o
? .hgignore
? a.c
? a.o
? dir/c.o
--
A dir/b.o
Benoit Boissinot
fix a bug in dirstate.changes when cwd != repo.root...
r1491 --
A b.o