##// 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.
Dirkjan Ochtman - - Load All Authors

File last commit:

r6336:4b0c9c67 default
r9115:b55d4471 default
Show More
test-annotate.out
98 lines | 1.5 KiB | text/plain | TextLexer
/ tests / test-annotate.out
History | Source | Raw |Copy content |Copy permalink
Giorgos Keramidas
tests: new test for "hg annotate"
 r2923 % init
% commit
adding a
% annotate -c
8435f90966e4: a
Thomas Arendsen Hein
Add --line-number option to hg annotate (issue506)...
 r4857 % annotate -cl
8435f90966e4:1: a
Giorgos Keramidas
tests: new test for "hg annotate"
 r2923 % annotate -d
Thu Jan 01 00:00:01 1970 +0000: a
% annotate -n
0: a
Thomas Arendsen Hein
Add --line-number option to hg annotate (issue506)...
 r4857 % annotate -nl
0:1: a
Giorgos Keramidas
tests: new test for "hg annotate"
 r2923 % annotate -u
nobody: a
% annotate -cdnu
nobody 0 8435f90966e4 Thu Jan 01 00:00:01 1970 +0000: a
Thomas Arendsen Hein
Add --line-number option to hg annotate (issue506)...
 r4857 % annotate -cdnul
nobody 0 8435f90966e4 Thu Jan 01 00:00:01 1970 +0000:1: a
% annotate -n b
Brendan Cully
Refactor annotate copy support.
 r3172 2: a
2: a
2: a
Thomas Arendsen Hein
Add --line-number option to hg annotate (issue506)...
 r4857 3: b4
3: b5
3: b6
% annotate -nl b
2:1: a
2:2: a
2:3: a
3:4: b4
3:5: b5
3:6: b6
Brendan Cully
Refactor annotate copy support.
 r3172 % annotate -nf b
0 a: a
1 a: a
1 a: a
Thomas Arendsen Hein
Add --line-number option to hg annotate (issue506)...
 r4857 3 b: b4
3 b: b5
3 b: b6
% annotate -nlf b
0 a:1: a
1 a:2: a
1 a:3: a
3 b:4: b4
3 b:5: b5
3 b:6: b6
Brendan Cully
Refactor annotate copy support.
 r3172 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Dirkjan Ochtman
warn about new heads on commit (issue842)
 r6336 created new head
Brendan Cully
Refactor annotate copy support.
 r3172 merging b
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% annotate after merge
0 a: a
1 a: a
1 a: a
Thomas Arendsen Hein
Add --line-number option to hg annotate (issue506)...
 r4857 3 b: b4
Brendan Cully
Refactor annotate copy support.
 r3172 4 b: c
Thomas Arendsen Hein
Add --line-number option to hg annotate (issue506)...
 r4857 3 b: b5
% annotate after merge with -l
0 a:1: a
1 a:2: a
1 a:3: a
3 b:4: b4
4 b:5: c
3 b:5: b5
Brendan Cully
Refactor annotate copy support.
 r3172 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
Dirkjan Ochtman
warn about new heads on commit (issue842)
 r6336 created new head
Brendan Cully
Refactor annotate copy support.
 r3172 merging b
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% annotate after rename merge
0 a: a
6 b: z
1 a: a
Thomas Arendsen Hein
Add --line-number option to hg annotate (issue506)...
 r4857 3 b: b4
Brendan Cully
Refactor annotate copy support.
 r3172 4 b: c
Thomas Arendsen Hein
Add --line-number option to hg annotate (issue506)...
 r4857 3 b: b5
Brendan Cully
Refactor annotate copy support.
 r3172 7 b: d
Thomas Arendsen Hein
Add --line-number option to hg annotate (issue506)...
 r4857 % annotate after rename merge with -l
0 a:1: a
6 b:2: z
1 a:3: a
3 b:4: b4
4 b:5: c
3 b:5: b5
7 b:7: d
Brendan Cully
Test annotate using named rev instead of linkrev
 r3405 % linkrev vs rev
0: a
1: a
1: a
Thomas Arendsen Hein
Add --line-number option to hg annotate (issue506)...
 r4857 % linkrev vs rev with -l
0:1: a
1:2: a
1:3: a
Patrick Mezard
test-annotate: add a test for issue 589.
 r4639 % generate ABA rename configuration
% annotate after ABA with follow
foo: foo