##// 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.
Thomas Arendsen Hein - - Load All Authors

File last commit:

r6381:0b89315d default
r9115:b55d4471 default
Show More
test-merge5.out
7 lines | 266 B | text/plain | TextLexer
/ tests / test-merge5.out
History | Source | Raw |Copy content |Copy permalink
Thomas Arendsen Hein
Make hg update more verbose by default (issue12)...
 r2175 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Bryan O'Sullivan
Update tests to match new addremove chattiness.
 r767 removing b
Dirkjan Ochtman
warn about new heads on commit (issue842)
 r6336 created new head
Matt Mackall
update: no -C needed to switch branches without outstanding changes
 r6350 % should abort
Matt Mackall
update: better logic and messages for updates...
 r6375 abort: crosses branches (use 'hg merge' or 'hg update -C' to discard changes)
Matt Mackall
update: no -C needed to switch branches without outstanding changes
 r6350 % should succeed
Thomas Arendsen Hein
Fix missing space in one of the new update messages.
 r6381 abort: crosses branches (use 'hg merge' or 'hg update -C')