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

r8765:9c75f16f default
r9115:b55d4471 default
Show More
test-convert-svn-branches
30 lines | 641 B | text/plain | TextLexer
/ tests / test-convert-svn-branches
Patrick Mezard
Test subversion branches conversion
r5874 #!/bin/sh
"$TESTDIR/hghave" svn svn-bindings || exit 80
fix_path()
{
tr '\\' /
}
echo "[extensions]" >> $HGRCPATH
echo "convert = " >> $HGRCPATH
echo "hgext.graphlog =" >> $HGRCPATH
svnadmin create svn-repo
Patrick Mezard
Rewrite svn tests using svndump...
r7475 cat "$TESTDIR/svn/branches.svndump" | svnadmin load svn-repo > /dev/null
Patrick Mezard
Test subversion branches conversion
r5874
echo % convert trunk and branches
Michael J. Pedersen
convert: adding branchmap functionality to convert extension
r8377 cat >branchmap <<EOF
old3 newbranch
EOF
Patrick Mezard
test-convert-svn-*: no longer need the url building code
r8765 hg convert --branchmap=branchmap --datesort -r 10 svn-repo A-hg
Patrick Mezard
Test subversion branches conversion
r5874
echo % convert again
Patrick Mezard
test-convert-svn-*: no longer need the url building code
r8765 hg convert --branchmap=branchmap --datesort svn-repo A-hg
Patrick Mezard
Test subversion branches conversion
r5874
cd A-hg
Martin Geisler
tests: replace #...# syntax with {...}
r8523 hg glog --template 'branch={branches} {rev} {desc|firstline} files: {files}\n'
Patrick Mezard
Test subversion branches conversion
r5874 hg branches | sed 's/:.*/:/'
hg tags -q
cd ..