##// 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:

r7229:7946503e default
r9115:b55d4471 default
Show More
test-dumprevlog.out
67 lines | 1.5 KiB | text/plain | TextLexer
/ tests / test-dumprevlog.out
Adrian Buehlmann
introduce fncache repository layout...
r7229 % prepare repo-a
Adrian Buehlmann
add tests for contrib/dumprevlog and undumprevlog
r6465 checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 3 changesets, 3 total revisions
Adrian Buehlmann
introduce fncache repository layout...
r7229
% dumping revlog of file a to stdout
Adrian Buehlmann
add tests for contrib/dumprevlog and undumprevlog
r6465 file: .hg/store/data/a.i
node: 183d2312b35066fb6b3b449b84efc370d50993d0
linkrev: 0
parents: 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000
length: 15
-start-
this is file a
-end-
node: b1047953b6e6b633c0d8197eaa5116fbdfd3095b
linkrev: 1
parents: 183d2312b35066fb6b3b449b84efc370d50993d0 0000000000000000000000000000000000000000
length: 32
-start-
this is file a
adding to file a
-end-
node: 8c4fd1f7129b8cdec6c7f58bf48fb5237a4030c1
linkrev: 2
parents: b1047953b6e6b633c0d8197eaa5116fbdfd3095b 0000000000000000000000000000000000000000
length: 54
-start-
this is file a
adding to file a
adding more to file a
-end-
Adrian Buehlmann
introduce fncache repository layout...
r7229 % dumprevlog done
% dump all revlogs to file repo.dump
% undumping into repo-b
Matt Mackall
merge: introduce mergestate
r6512 .hg/store/00changelog.i
Adrian Buehlmann
add tests for contrib/dumprevlog and undumprevlog
r6465 .hg/store/00manifest.i
Matt Mackall
merge: introduce mergestate
r6512 .hg/store/data/a.i
Adrian Buehlmann
introduce fncache repository layout...
r7229 % undumping done
% clone --pull repo-b repo-c to rebuild fncache
requesting all changes
adding changesets
adding manifests
adding file changes
added 3 changesets with 3 changes to 1 files
% verify repo-c
Adrian Buehlmann
add tests for contrib/dumprevlog and undumprevlog
r6465 checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 3 changesets, 3 total revisions
Adrian Buehlmann
introduce fncache repository layout...
r7229
% comparing repos
Adrian Buehlmann
add tests for contrib/dumprevlog and undumprevlog
r6465 comparing with repo-a
searching for changes
no changes found
Adrian Buehlmann
introduce fncache repository layout...
r7229 comparing with repo-c
Adrian Buehlmann
add tests for contrib/dumprevlog and undumprevlog
r6465 searching for changes
no changes found