##// 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-non-interactive-wsgi
68 lines | 1.4 KiB | text/plain | TextLexer
/ tests / test-non-interactive-wsgi
Dirkjan Ochtman
Don't try to determine interactivity if ui() called with interactive=False....
r5337 #!/bin/sh
Dirkjan Ochtman
Fix style nit and add some comments to tests.
r5580 # Tests if hgweb can run without touching sys.stdin, as is required
# by the WSGI standard and strictly implemented by mod_wsgi.
Dirkjan Ochtman
Don't try to determine interactivity if ui() called with interactive=False....
r5337
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"
Dirkjan Ochtman
Don't try to determine interactivity if ui() called with interactive=False....
r5337 hg tip
cat > request.py <<EOF
from mercurial import dispatch
from mercurial.hgweb.hgweb_mod import hgweb
from mercurial.ui import ui
from mercurial import hg
from StringIO import StringIO
Bryan O'Sullivan
Allow tests to run in parallel.
r5384 import os, sys
Dirkjan Ochtman
Don't try to determine interactivity if ui() called with interactive=False....
r5337
class FileLike(object):
def __init__(self, real):
self.real = real
def fileno(self):
print >> sys.__stdout__, 'FILENO'
return self.real.fileno()
def read(self):
print >> sys.__stdout__, 'READ'
return self.real.read()
def readline(self):
print >> sys.__stdout__, 'READLINE'
return self.real.readline()
sys.stdin = FileLike(sys.stdin)
errors = StringIO()
input = StringIO()
output = 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': '',
'PATH_INFO': '',
'QUERY_STRING': '',
'SERVER_NAME': '127.0.0.1',
Bryan O'Sullivan
Allow tests to run in parallel.
r5384 'SERVER_PORT': os.environ['HGPORT'],
Dirkjan Ochtman
Don't try to determine interactivity if ui() called with interactive=False....
r5337 'SERVER_PROTOCOL': 'HTTP/1.0'
}
Dirkjan Ochtman
Less indirection in the WSGI web interface. This simplifies some code, and makes it more compliant with WSGI.
r5566 hgweb('.')(env, startrsp)
Dirkjan Ochtman
Don't try to determine interactivity if ui() called with interactive=False....
r5337 print '---- ERRORS'
print errors.getvalue()
EOF
python request.py