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

r8167:6c82beaa default
r9115:b55d4471 default
Show More
test-hgweb
44 lines | 1.5 KiB | text/plain | TextLexer
Brendan Cully
hgweb: simple tests
r3942 #!/bin/sh
Dirkjan Ochtman
Fix style nit and add some comments to tests.
r5580 # Some tests for hgweb. Tests static files, plain files and different 404's.
Brendan Cully
hgweb: simple tests
r3942
hg init test
cd test
mkdir da
echo foo > da/foo
echo foo > foo
Martin Geisler
tests: removed redundant "-d '0 0'" from test scripts...
r8167 hg ci -Ambase
Matt Mackall
tests: fix test-hgweb to not leak directory name
r7341 hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
Bryan O'Sullivan
hgweb: return meaningful HTTP status codes instead of nonsense
r5561 cat hg.pid >> $DAEMON_PIDS
Brendan Cully
hgweb: simple tests
r3942 echo % manifest
Bryan O'Sullivan
Allow tests to run in parallel.
r5384 ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/?style=raw')
("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/da?style=raw')
Bryan O'Sullivan
hgweb: return meaningful HTTP status codes instead of nonsense
r5561
echo % plain file
"$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/foo?style=raw'
echo % should give a 404 - static file that does not exist
"$TESTDIR/get-with-headers.py" localhost:$HGPORT '/static/bogus'
echo % should give a 404 - bad revision
"$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/spam/foo?style=raw'
echo % should give a 400 - bad command
Bryan O'Sullivan
hgweb: account for Python 2.4 in one test
r5564 "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/foo?cmd=spam&style=raw' | sed 's/400.*/400/'
Bryan O'Sullivan
hgweb: return meaningful HTTP status codes instead of nonsense
r5561
echo % should give a 404 - file does not exist
"$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/bork?style=raw'
Dirkjan Ochtman
hgweb: better error messages
r6368 "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/bork'
"$TESTDIR/get-with-headers.py" localhost:$HGPORT '/diff/tip/bork?style=raw'
Bryan O'Sullivan
hgweb: return meaningful HTTP status codes instead of nonsense
r5561
Mirko Friedenhagen
server: append to logfiles
r5690 echo % stop and restart
Mads Kiilerich
tests: use killdaemons in hgweb tests...
r7428 "$TESTDIR/killdaemons.py"
Mirko Friedenhagen
server: append to logfiles
r5690 hg serve -p $HGPORT -d --pid-file=hg.pid -A access.log
cat hg.pid >> $DAEMON_PIDS
# Test the access/error files are opened in append mode
python -c "print len(file('access.log').readlines()), 'log lines written'"
Bryan O'Sullivan
hgweb: return meaningful HTTP status codes instead of nonsense
r5561 echo % static file
"$TESTDIR/get-with-headers.py" localhost:$HGPORT '/static/style-gitweb.css'
Dirkjan Ochtman
better error reporting for hg serve errors in tests
r5924
echo % errors
cat errors.log