##// 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-no-path-info
60 lines | 1.3 KiB | text/plain | TextLexer
/ tests / test-hgweb-no-path-info
Dirkjan Ochtman
hgweb: make hgwebdir work in the absence of PATH_INFO...
r6459 #!/bin/sh
# This tests if hgweb and hgwebdir still work if the REQUEST_URI variable is
# no longer passed with the request. Instead, SCRIPT_NAME and PATH_INFO
# should be used from d74fc8dec2b4 onward to route the request.
mkdir repo
cd repo
hg init
echo foo > bar
hg add bar
Martin Geisler
tests: removed redundant "-d '0 0'" from test scripts...
r8167 hg commit -m "test" -u "Testing"
Dirkjan Ochtman
hgweb: make hgwebdir work in the absence of PATH_INFO...
r6459 hg tip
cat > request.py <<EOF
from mercurial.hgweb import hgweb, hgwebdir
from StringIO import StringIO
import os, sys
errors = StringIO()
input = StringIO()
def startrsp(headers, data):
print '---- HEADERS'
print headers
print '---- DATA'
print data
return output.write
env = {
'wsgi.version': (1, 0),
'wsgi.url_scheme': 'http',
'wsgi.errors': errors,
'wsgi.input': input,
'wsgi.multithread': False,
'wsgi.multiprocess': False,
'wsgi.run_once': False,
'REQUEST_METHOD': 'GET',
'SCRIPT_NAME': '',
'SERVER_NAME': '127.0.0.1',
'SERVER_PORT': os.environ['HGPORT'],
'SERVER_PROTOCOL': 'HTTP/1.0'
}
Dirkjan Ochtman
hgweb: return content iterator instead of using write() callable...
r6945 def process(app):
content = app(env, startrsp)
sys.stdout.write(output.getvalue())
sys.stdout.write(''.join(content))
print '---- ERRORS'
print errors.getvalue()
Dirkjan Ochtman
hgweb: make hgwebdir work in the absence of PATH_INFO...
r6459 output = StringIO()
env['QUERY_STRING'] = 'style=atom'
Dirkjan Ochtman
hgweb: return content iterator instead of using write() callable...
r6945 process(hgweb('.', name='repo'))
Dirkjan Ochtman
hgweb: make hgwebdir work in the absence of PATH_INFO...
r6459
output = StringIO()
env['QUERY_STRING'] = 'style=raw'
Dirkjan Ochtman
hgweb: return content iterator instead of using write() callable...
r6945 process(hgwebdir({'repo': '.'}))
Dirkjan Ochtman
hgweb: make hgwebdir work in the absence of PATH_INFO...
r6459 EOF
python request.py | sed "s/http:\/\/127\.0\.0\.1:[0-9]*\//http:\/\/127.0.0.1\//"