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

r9031:3b76321a default
r9115:b55d4471 default
Show More
test-dispatch.py
32 lines | 754 B | text/x-python | PythonLexer
Thomas Arendsen Hein
Added test for commands.dispatch (especially 88803a69b24)
r5095 import os
Matt Mackall
dispatch: move command dispatching into its own module...
r5178 from mercurial import dispatch
Thomas Arendsen Hein
Added test for commands.dispatch (especially 88803a69b24)
r5095
Matt Mackall
dispatch: move command dispatching into its own module...
r5178 def testdispatch(cmd):
"""Simple wrapper around dispatch.dispatch()
Thomas Arendsen Hein
Added test for commands.dispatch (especially 88803a69b24)
r5095
Prints command and result value, but does not handle quoting.
"""
print "running: %s" % (cmd,)
Matt Mackall
dispatch: move command dispatching into its own module...
r5178 result = dispatch.dispatch(cmd.split())
Thomas Arendsen Hein
Added test for commands.dispatch (especially 88803a69b24)
r5095 print "result: %r" % (result,)
Matt Mackall
dispatch: move command dispatching into its own module...
r5178 testdispatch("init test1")
Thomas Arendsen Hein
Added test for commands.dispatch (especially 88803a69b24)
r5095 os.chdir('test1')
# create file 'foo', add and commit
Alejandro Santos
compat: use open() instead of file() everywhere
r9031 f = open('foo', 'wb')
Thomas Arendsen Hein
Added test for commands.dispatch (especially 88803a69b24)
r5095 f.write('foo\n')
f.close()
Matt Mackall
dispatch: move command dispatching into its own module...
r5178 testdispatch("add foo")
testdispatch("commit -m commit1 -d 2000-01-01 foo")
Thomas Arendsen Hein
Added test for commands.dispatch (especially 88803a69b24)
r5095
# append to file 'foo' and commit
Alejandro Santos
compat: use open() instead of file() everywhere
r9031 f = open('foo', 'ab')
Thomas Arendsen Hein
Added test for commands.dispatch (especially 88803a69b24)
r5095 f.write('bar\n')
f.close()
Matt Mackall
dispatch: move command dispatching into its own module...
r5178 testdispatch("commit -m commit2 -d 2000-01-02 foo")
Thomas Arendsen Hein
Added test for commands.dispatch (especially 88803a69b24)
r5095
# check 88803a69b24 (fancyopts modified command table)
Matt Mackall
dispatch: move command dispatching into its own module...
r5178 testdispatch("log -r 0")
testdispatch("log -r tip")