##// END OF EJS Templates
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.

File last commit:

r7586:e9d3a11e default
r9115:b55d4471 default
Show More
test-audit-path.out
30 lines | 874 B | text/plain | TextLexer
/ tests / test-audit-path.out
Bryan O'Sullivan
Make audit_path more stringent....
r5158 % should fail
abort: path contains illegal component: .hg/00changelog.i
adding a/a
% should fail
abort: path 'b/b' traverses symbolic link 'b'
% should succeed
% should still fail - maybe
abort: path 'b/b' traverses symbolic link 'b'
Peter Arrenbrecht
test-audit-path: add more tests (issue 1450)
r7554 % unbundle tampered bundle
adding changesets
adding manifests
adding file changes
Peter Arrenbrecht
test-audit-path: add one more test (issue 1450)
r7586 added 5 changesets with 6 changes to 6 files (+4 heads)
Peter Arrenbrecht
test-audit-path: add more tests (issue 1450)
r7554 (run 'hg heads' to see heads, 'hg merge' to merge)
% attack .hg/test
.hg/test
abort: path contains illegal component: .hg/test
% attack foo/.hg/test
foo/.hg/test
abort: path 'foo/.hg/test' is inside repo 'foo'
% attack back/test where back symlinks to ..
back
back/test
abort: path 'back/test' traverses symbolic link 'back'
% attack ../test
../test
abort: path contains illegal component: ../test
Peter Arrenbrecht
test-audit-path: add one more test (issue 1450)
r7586 % attack /tmp/test
/tmp/test
abort: No such file or directory: [HGTMP]/test-audit-path/target//tmp/test