##// 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.
Martin Geisler - - Load All Authors

File last commit:

r8167:6c82beaa default
r9115:b55d4471 default
Show More
test-rename-dir-merge
33 lines | 383 B | text/plain | TextLexer
/ tests / test-rename-dir-merge
History | Source | Raw |Copy content |Copy permalink
Matt Mackall
merge: handle directory renames...
 r3733 #!/bin/sh
mkdir t
cd t
hg init
mkdir a
echo foo > a/a
echo bar > a/b
Martin Geisler
tests: removed redundant "-d '0 0'" from test scripts...
 r8167 hg ci -Am "0"
Matt Mackall
merge: handle directory renames...
 r3733
hg co -C 0
hg mv a b
Martin Geisler
tests: removed redundant "-d '0 0'" from test scripts...
 r8167 hg ci -m "1 mv a/ b/"
Matt Mackall
merge: handle directory renames...
 r3733
hg co -C 0
echo baz > a/c
Matt Mackall
rename: add test for moving untracked files in directories
 r5567 echo quux > a/d
Matt Mackall
merge: handle directory renames...
 r3733 hg add a/c
Martin Geisler
tests: removed redundant "-d '0 0'" from test scripts...
 r8167 hg ci -m "2 add a/c"
Matt Mackall
merge: handle directory renames...
 r3733
hg merge --debug 1
Thomas Arendsen Hein
Fix test-rename-dir-merge for different implementations of ls.
 r3748 echo a/* b/*
Matt Mackall
merge: handle directory renames...
 r3733 hg st -C
Martin Geisler
tests: removed redundant "-d '0 0'" from test scripts...
 r8167 hg ci -m "3 merge 2+1"
Alexis S. L. Carvalho
correctly record file-level history when the local side renames a directory
 r5229 hg debugrename b/c
Matt Mackall
merge: handle directory renames...
 r3733
hg co -C 1
hg merge --debug 2
Thomas Arendsen Hein
Fix test-rename-dir-merge for different implementations of ls.
 r3748 echo a/* b/*
Matt Mackall
merge: handle directory renames...
 r3733 hg st -C
Martin Geisler
tests: removed redundant "-d '0 0'" from test scripts...
 r8167 hg ci -m "4 merge 1+2"
Alexis S. L. Carvalho
correctly record file-level history when the local side renames a directory
 r5229 hg debugrename b/c