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

r8656:284fda4c default
r9115:b55d4471 default
Show More
test-walkrepo.py
52 lines | 1.8 KiB | text/x-python | PythonLexer
Eric Hopper
test: Add tests for webdir symlinks and walkrepos.
r6341 import os
from mercurial import hg, ui
Martin Geisler
util: use built-in set and frozenset...
r8150 from mercurial.util import walkrepos
Eric Hopper
test: Add tests for webdir symlinks and walkrepos.
r6341 from os import mkdir, chdir
from os.path import join as pjoin
u = ui.ui()
sym = hasattr(os, 'symlink') and hasattr(os.path, 'samestat')
hg.repository(u, 'top1', create=1)
mkdir('subdir')
chdir('subdir')
hg.repository(u, 'sub1', create=1)
mkdir('subsubdir')
chdir('subsubdir')
hg.repository(u, 'subsub1', create=1)
chdir(os.path.pardir)
if sym:
os.symlink(os.path.pardir, 'circle')
os.symlink(pjoin('subsubdir', 'subsub1'), 'subsub1')
def runtest():
reposet = frozenset(walkrepos('.', followsym=True))
Patrick Mezard
util: disable walkrepo() recursive behaviour...
r7494 if sym and (len(reposet) != 3):
Eric Hopper
test: Add tests for webdir symlinks and walkrepos.
r6341 print "reposet = %r" % (reposet,)
Patrick Mezard
Merge with crew-stable
r7495 print "Found %d repositories when I should have found 3" % (len(reposet),)
Patrick Mezard
util: disable walkrepo() recursive behaviour...
r7494 if (not sym) and (len(reposet) != 2):
Eric Hopper
test: Add tests for webdir symlinks and walkrepos.
r6341 print "reposet = %r" % (reposet,)
Patrick Mezard
Merge with crew-stable
r7495 print "Found %d repositories when I should have found 2" % (len(reposet),)
Eric Hopper
test: Add tests for webdir symlinks and walkrepos.
r6341 sub1set = frozenset((pjoin('.', 'sub1'),
pjoin('.', 'circle', 'subdir', 'sub1')))
if len(sub1set & reposet) != 1:
print "sub1set = %r" % (sub1set,)
print "reposet = %r" % (reposet,)
Benoit Allard
tests: test-walkrepo shouldn't throw SystemExit...
r7492 print "sub1set and reposet should have exactly one path in common."
Eric Hopper
test: Add tests for webdir symlinks and walkrepos.
r6341 sub2set = frozenset((pjoin('.', 'subsub1'),
pjoin('.', 'subsubdir', 'subsub1')))
if len(sub2set & reposet) != 1:
print "sub2set = %r" % (sub2set,)
print "reposet = %r" % (reposet,)
Benoit Allard
tests: test-walkrepo shouldn't throw SystemExit...
r7492 print "sub1set and reposet should have exactly one path in common."
Eric Hopper
test: Add tests for webdir symlinks and walkrepos.
r6341 sub3 = pjoin('.', 'circle', 'top1')
if sym and not (sub3 in reposet):
print "reposet = %r" % (reposet,)
Benoit Allard
tests: test-walkrepo shouldn't throw SystemExit...
r7492 print "Symbolic links are supported and %s is not in reposet" % (sub3,)
Eric Hopper
test: Add tests for webdir symlinks and walkrepos.
r6341
runtest()
if sym:
# Simulate not having symlinks.
del os.path.samestat
sym = False
runtest()