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

r8245:0eade101 default
r9115:b55d4471 default
Show More
test-hgwebdir
106 lines | 3.2 KiB | text/plain | TextLexer
Bryan O'Sullivan
hgweb: return meaningful HTTP status codes instead of nonsense
r5561 #!/bin/sh
Dirkjan Ochtman
Fix style nit and add some comments to tests.
r5580 # Tests some basic hgwebdir functionality. Tests setting up paths and
# collection, different forms of 404s and the subdirectory support.
Bryan O'Sullivan
hgweb: return meaningful HTTP status codes instead of nonsense
r5561
mkdir webdir
cd webdir
hg init a
echo a > a/a
hg --cwd a ci -Ama -d'1 0'
Benoit Allard
hgweb: recurse down collections only if ** in [paths]...
r7523 # create a mercurial queue repository
hg --cwd a qinit --config extensions.hgext.mq= -c
Bryan O'Sullivan
hgweb: return meaningful HTTP status codes instead of nonsense
r5561
hg init b
echo b > b/b
hg --cwd b ci -Amb -d'2 0'
Benoit Allard
hgweb: recurse down collections only if ** in [paths]...
r7523 # create a nested repository
cd b
hg init d
echo d > d/d
hg --cwd d ci -Amd -d'3 0'
cd ..
Bryan O'Sullivan
hgweb: return meaningful HTTP status codes instead of nonsense
r5561 hg init c
echo c > c/c
hg --cwd c ci -Amc -d'3 0'
Benoit Allard
hgweb: recurse down collections only if ** in [paths]...
r7523
Patrick Mezard
util: disable walkrepo() recursive behaviour...
r7494 root=`pwd`
Bryan O'Sullivan
hgweb: return meaningful HTTP status codes instead of nonsense
r5561 cd ..
cat > paths.conf <<EOF
[paths]
a=$root/a
b=$root/b
EOF
hg serve -p $HGPORT -d --pid-file=hg.pid --webdir-conf paths.conf \
Dirkjan Ochtman
hgwebdir: split out makeindex function, facilitate test failure diagnosis
r5601 -A access-paths.log -E error-paths-1.log
Bryan O'Sullivan
hgweb: return meaningful HTTP status codes instead of nonsense
r5561 cat hg.pid >> $DAEMON_PIDS
echo % should give a 404 - file does not exist
"$TESTDIR/get-with-headers.py" localhost:$HGPORT '/a/file/tip/bork?style=raw'
echo % should succeed
"$TESTDIR/get-with-headers.py" localhost:$HGPORT '/?style=raw'
"$TESTDIR/get-with-headers.py" localhost:$HGPORT '/a/file/tip/a?style=raw'
"$TESTDIR/get-with-headers.py" localhost:$HGPORT '/b/file/tip/b?style=raw'
echo % should give a 404 - repo is not published
"$TESTDIR/get-with-headers.py" localhost:$HGPORT '/c/file/tip/c?style=raw'
Dirkjan Ochtman
Add tests for hgwebdir repository names with slashes in them.
r5578 cat > paths.conf <<EOF
[paths]
Patrick Mezard
hgwebdir: test virtual paths leading or trailing separators are stripped
r5586 t/a/=$root/a
Dirkjan Ochtman
Add tests for hgwebdir repository names with slashes in them.
r5578 b=$root/b
Patrick Mezard
hgweb: extend [paths] syntax to match repositories recursively (issue852)...
r7450 coll=$root/*
Benoit Allard
hgweb: recurse down collections only if ** in [paths]...
r7523 rcoll=$root/**
Dirkjan Ochtman
Add tests for hgwebdir repository names with slashes in them.
r5578 EOF
hg serve -p $HGPORT1 -d --pid-file=hg.pid --webdir-conf paths.conf \
Dirkjan Ochtman
hgwebdir: split out makeindex function, facilitate test failure diagnosis
r5601 -A access-paths.log -E error-paths-2.log
Dirkjan Ochtman
Add tests for hgwebdir repository names with slashes in them.
r5578 cat hg.pid >> $DAEMON_PIDS
echo % should succeed, slashy names
"$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/?style=raw'
Dirkjan Ochtman
tests: add tests for styled hgwebdir pages
r8217 "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/?style=paper' \
Martijn Pieters
Don't use sed -r; instead use old-style regexp...
r8245 | sed "s/[0-9]\{1,\} seconds\{0,1\} ago/seconds ago/"
Dirkjan Ochtman
Add tests for hgwebdir repository names with slashes in them.
r5578 "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/t?style=raw'
"$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/t/?style=raw'
Dirkjan Ochtman
tests: add tests for styled hgwebdir pages
r8217 "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/t/?style=paper' \
Martijn Pieters
Don't use sed -r; instead use old-style regexp...
r8245 | sed "s/[0-9]\{1,\} seconds\{0,1\} ago/seconds ago/"
Dirkjan Ochtman
Add tests for hgwebdir repository names with slashes in them.
r5578 "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/t/a?style=atom' \
| sed "s/http:\/\/[^/]*\//http:\/\/127.0.0.1\//"
"$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/t/a/?style=atom' \
| sed "s/http:\/\/[^/]*\//http:\/\/127.0.0.1\//"
"$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/t/a/file/tip/a?style=raw'
Patrick Mezard
hgweb: extend [paths] syntax to match repositories recursively (issue852)...
r7450 # Test [paths] '*' extension
"$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/coll/?style=raw'
"$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/coll/a/file/tip/a?style=raw'
Benoit Allard
hgweb: recurse down collections only if ** in [paths]...
r7523 #test [paths] '**' extension
"$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/rcoll/?style=raw'
"$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/rcoll/b/d/file/tip/d?style=raw'
Dirkjan Ochtman
Add tests for hgwebdir repository names with slashes in them.
r5578
Bryan O'Sullivan
hgweb: return meaningful HTTP status codes instead of nonsense
r5561 cat > collections.conf <<EOF
[collections]
$root=$root
EOF
Dirkjan Ochtman
Add tests for hgwebdir repository names with slashes in them.
r5578 hg serve -p $HGPORT2 -d --pid-file=hg.pid --webdir-conf collections.conf \
Bryan O'Sullivan
hgweb: return meaningful HTTP status codes instead of nonsense
r5561 -A access-collections.log -E error-collections.log
cat hg.pid >> $DAEMON_PIDS
Benoit Allard
hgweb: recurse down collections only if ** in [paths]...
r7523 echo % collections: should succeed
Dirkjan Ochtman
Add tests for hgwebdir repository names with slashes in them.
r5578 "$TESTDIR/get-with-headers.py" localhost:$HGPORT2 '/?style=raw'
"$TESTDIR/get-with-headers.py" localhost:$HGPORT2 '/a/file/tip/a?style=raw'
"$TESTDIR/get-with-headers.py" localhost:$HGPORT2 '/b/file/tip/b?style=raw'
"$TESTDIR/get-with-headers.py" localhost:$HGPORT2 '/c/file/tip/c?style=raw'
Dirkjan Ochtman
hgwebdir: split out makeindex function, facilitate test failure diagnosis
r5601
echo % paths errors 1
cat error-paths-1.log
echo % paths errors 2
cat error-paths-2.log
echo % collections errors
cat error-collections.log