##// 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.
Mads Kiilerich - - Load All Authors

File last commit:

r9110:561ff8d9 default
r9115:b55d4471 default
Show More
test-mq-qimport.out
33 lines | 851 B | text/plain | TextLexer
/ tests / test-mq-qimport.out
History | Source | Raw |Copy content |Copy permalink
Martin Geisler
qimport: report filename in case of IOError...
 r6940 % qimport non-existing-file
Benoit Boissinot
Catch both IOError and OSError, fix regression introduced by 8046f0a070a6
 r7421 abort: unable to read non-existing-file
Brendan Cully
mq: let qimport read patches from URLs
 r7158 % import URL
adding url.diff to series file
url.diff
Brendan Cully
mq: make qimport -f work properly. Closes issue1255....
 r7160 % import patch that already exists
abort: patch "url.diff" already exists
applying url.diff
Martin Geisler
mq: lowercase output...
 r7627 now at: url.diff
Brendan Cully
mq: make qimport -f work properly. Closes issue1255....
 r7160 foo
Mads Kiilerich
mq: qpop now tells which patches are popped...
 r9110 popping url.diff
Martin Geisler
mq: lowercase output...
 r7627 patch queue now empty
Brendan Cully
mq: make qimport -f work properly. Closes issue1255....
 r7160 % qimport -f
adding url.diff to series file
applying url.diff
Martin Geisler
mq: lowercase output...
 r7627 now at: url.diff
Brendan Cully
mq: make qimport -f work properly. Closes issue1255....
 r7160 foo2
Mads Kiilerich
mq: qpop now tells which patches are popped...
 r9110 popping url.diff
Martin Geisler
mq: lowercase output...
 r7627 patch queue now empty
Patrick Mezard
mq: qimport must read patches in binary mode
 r6027 % build diff with CRLF
adding b
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% qimport CRLF diff
adding b.diff to series file
applying b.diff
Martin Geisler
mq: lowercase output...
 r7627 now at: b.diff
Dirkjan Ochtman
mq: add -P/--push option to qimport
 r8362 % try to import --push
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding another.diff to series file
applying another.diff
now at: another.diff
Dirkjan Ochtman
mq: warn about finalizing patches without cset message
 r8832 patch b.diff finalized without changeset message
patch another.diff finalized without changeset message