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

r5914:8e7796a9 default
r9115:b55d4471 default
Show More
test-strip-cross
68 lines | 1.1 KiB | text/plain | TextLexer
Alexis S. L. Carvalho
strip: calculate list of extra nodes to save and pass it to changegroupsubset...
r5909 #!/bin/sh
# test stripping of filelogs where the linkrev doesn't always increase
echo '[extensions]' >> $HGRCPATH
echo 'hgext.mq =' >> $HGRCPATH
hg init orig
cd orig
hidefilename()
{
sed -e 's/saving bundle to .*strip-backup/saving bundle to strip-backup/'
}
commit()
{
hg up -qC null
count=1
for i in "$@"; do
for f in $i; do
echo $count > $f
done
count=`expr $count + 1`
done
hg commit -qAm "$*"
}
# 2 1 0 2 0 1 2
commit '201 210'
commit '102 120' '210'
commit '021'
commit '201' '021 120'
commit '012 021' '102 201' '120 210'
Alexis S. L. Carvalho
test-strip-cross: test handling of linkrev crosses in the manifest
r5912 commit 'manifest-file'
Alexis S. L. Carvalho
strip: calculate list of extra nodes to save and pass it to changegroupsubset...
r5909 commit '102 120' '012 210' '021 201'
commit '201 210' '021 120' '012 102'
Alexis S. L. Carvalho
fix test-strip-cross on solaris...
r5914 HGUSER=another-user; export HGUSER
commit 'manifest-file'
Alexis S. L. Carvalho
test-strip-cross: test handling of linkrev crosses in the manifest
r5912
commit '012' 'manifest-file'
Alexis S. L. Carvalho
strip: calculate list of extra nodes to save and pass it to changegroupsubset...
r5909 cd ..
Alexis S. L. Carvalho
test-strip-cross: test handling of linkrev crosses in the manifest
r5912 hg clone -q -U -r -1 -r -2 -r -3 -r -4 -r -6 orig crossed
Alexis S. L. Carvalho
strip: calculate list of extra nodes to save and pass it to changegroupsubset...
r5909
Richard Lowe
Fix test-strip-cross on Solaris...
r5911 for i in crossed/.hg/store/00manifest.i crossed/.hg/store/data/*.i; do
Alexis S. L. Carvalho
strip: calculate list of extra nodes to save and pass it to changegroupsubset...
r5909 echo $i
hg debugindex $i
echo
done
Alexis S. L. Carvalho
test-strip-cross: test handling of linkrev crosses in the manifest
r5912 for i in 0 1 2 3 4; do
Alexis S. L. Carvalho
strip: calculate list of extra nodes to save and pass it to changegroupsubset...
r5909 hg clone -q -U --pull crossed $i
echo "% Trying to strip revision $i"
hg --cwd $i strip $i 2>&1 | hidefilename
echo "% Verifying"
hg --cwd $i verify
echo
done