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

r8254:f108e894 default
r9115:b55d4471 default
Show More
test-churn
50 lines | 1003 B | text/plain | TextLexer
#!/bin/sh
echo "[extensions]" >> $HGRCPATH
echo "churn=" >> $HGRCPATH
COLUMNS=80; export COLUMNS
echo % create test repository
hg init repo
cd repo
echo a > a
hg ci -Am adda -u user1 -d 6:00
echo b >> a
echo b > b
hg ci -m changeba -u user2 -d 9:00 a
hg ci -Am addb -u user2 -d 9:30
echo c >> a
echo c >> b
echo c > c
hg ci -m changeca -u user3 -d 12:00 a
hg ci -m changecb -u user3 -d 12:15 b
hg ci -Am addc -u user3 -d 12:30
mkdir -p d/e
echo abc > d/e/f1.txt
hg ci -Am "add d/e/f1.txt" -u user1 -d 12:45 d/e/f1.txt
mkdir -p d/g
echo def > d/g/f2.txt
hg ci -Am "add d/g/f2.txt" -u user1 -d 13:00 d/g/f2.txt
echo % churn separate directories
hg churn d/e
echo % churn all
hg churn
echo % churn up to rev 2
hg churn -r :2
echo % churn with aliases
cat > ../aliases <<EOF
user1 alias1
user3 alias3
EOF
hg churn --aliases ../aliases
echo % churn with .hgchurn
mv ../aliases .hgchurn
hg churn
rm .hgchurn
echo % churn with column specifier
COLUMNS=40 hg churn
echo % churn by hour
hg churn -f '%H' -s