##// 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-pull-from-bundle.out
59 lines | 1.6 KiB | text/plain | TextLexer
/ tests / test-mq-pull-from-bundle.out
History | Source | Raw |Copy content |Copy permalink
Peter Arrenbrecht
Fix income/pull with bundle and -R (issue 820)....
 r5664 ====== Setup main
adding one
====== Bundle main
Thomas Arendsen Hein
Show number of changesets written to bundle files by default (issue569)...
 r5763 2 changesets found
Peter Arrenbrecht
Fix income/pull with bundle and -R (issue 820)....
 r5664 ====== Incoming to fresh repo
>> hg -R fresh incoming main.hg
comparing with main.hg
0: main: one added.
1: main: one updated.
>> hg -R fresh incoming bundle:fresh+main.hg
comparing with bundle:fresh+main.hg
0: main: one added.
1: main: one updated.
====== Setup queue
adding two
Mads Kiilerich
mq: qpop now tells which patches are popped...
 r9110 popping two.patch
Martin Geisler
mq: lowercase output...
 r7627 patch queue now empty
Peter Arrenbrecht
Fix income/pull with bundle and -R (issue 820)....
 r5664 ====== Bundle queue
Thomas Arendsen Hein
Show number of changesets written to bundle files by default (issue569)...
 r5763 1 changesets found
Peter Arrenbrecht
Fix income/pull with bundle and -R (issue 820)....
 r5664 ====== Clone base
Adrian Buehlmann
clone: print "updating working directory" status message...
 r6338 updating working directory
Peter Arrenbrecht
Fix income/pull with bundle and -R (issue 820)....
 r5664 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
====== Incoming queue bundle
>> hg -R .hg/patches incoming ../queue.hgq
comparing with ../queue.hgq
0: queue: two.patch added.
====== Pull queue bundle
>> hg -R .hg/patches pull --update ../queue.hgq
pulling from ../queue.hgq
requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 3 changes to 3 files
merging series
2 files updated, 1 files merged, 0 files removed, 0 files unresolved
>> hg -R .hg/patches heads
0: queue: two.patch added.
>> hg -R .hg/patches log
0: queue: two.patch added.
>> hg qseries
two.patch
====== Clone base again
Adrian Buehlmann
clone: print "updating working directory" status message...
 r6338 updating working directory
Peter Arrenbrecht
Fix income/pull with bundle and -R (issue 820)....
 r5664 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
====== Unbundle queue bundle
>> hg -R .hg/patches unbundle --update ../queue.hgq
adding changesets
adding manifests
adding file changes
added 1 changesets with 3 changes to 3 files
merging series
2 files updated, 1 files merged, 0 files removed, 0 files unresolved
>> hg -R .hg/patches heads
0: queue: two.patch added.
>> hg -R .hg/patches log
0: queue: two.patch added.
>> hg qseries
two.patch