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

r7261:4ba89b6d default
r9115:b55d4471 default
Show More
test-bookmarks
99 lines | 1.5 KiB | text/plain | TextLexer
#!/bin/sh
echo "[extensions]" >> $HGRCPATH
echo "bookmarks=" >> $HGRCPATH
hg init
echo % no bookmarks
hg bookmarks
echo % bookmark rev -1
hg bookmark X
echo % list bookmarks
hg bookmarks
echo a > a
hg add a
hg commit -m 0
echo % bookmark X moved to rev 0
hg bookmarks
echo % look up bookmark
hg log -r X
echo % second bookmark for rev 0
hg bookmark X2
echo % bookmark rev -1 again
hg bookmark -r null Y
echo % list bookmarks
hg bookmarks
echo b > b
hg add b
hg commit -m 1
echo % bookmarks X and X2 moved to rev 1, Y at rev -1
hg bookmarks
echo % bookmark rev 0 again
hg bookmark -r 0 Z
echo c > c
hg add c
hg commit -m 2
echo % bookmarks X and X2 moved to rev 2, Y at rev -1, Z at rev 0
hg bookmarks
echo % rename nonexistent bookmark
hg bookmark -m A B
echo % rename to existent bookmark
hg bookmark -m X Y
echo % force rename to existent bookmark
hg bookmark -f -m X Y
echo % list bookmarks
hg bookmark
echo % rename without new name
hg bookmark -m Y
echo % delete without name
hg bookmark -d
echo % delete nonexistent bookmark
hg bookmark -d A
echo % bookmark name with spaces should be stripped
hg bookmark ' x y '
echo % list bookmarks
hg bookmarks
echo % look up stripped bookmark name
hg log -r 'x y'
echo % reject bookmark name with newline
hg bookmark '
'
echo % bookmark with existing name
hg bookmark Z
echo % force bookmark with existing name
hg bookmark -f Z
echo % list bookmarks
hg bookmark
echo % revision but no bookmark name
hg bookmark -r .
true