##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

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.
Benoit Boissinot - - Load All Authors

File last commit:

r7919:3e620696 default
r9115:b55d4471 default
Show More
test-bad-pull
30 lines | 747 B | text/plain | TextLexer
/ tests / test-bad-pull
History | Source | Raw |Copy content |Copy permalink
Thomas Arendsen Hein
Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.
 r800 #!/bin/sh
mpm@selenic.com
commands: report http exceptions nicely...
 r395
Benoit Boissinot
Backed out changeset 490e40816cbd...
 r7919 hg clone http://localhost:$HGPORT/ copy
echo $?
Alexis S. L. Carvalho
Don't use test -e in tests - sh doesn't like it on Solaris
 r3469 test -d copy || echo copy: No such file or directory
mpm@selenic.com
commands: report http exceptions nicely...
 r395
cat > dumb.py <<EOF
Bryan O'Sullivan
Allow tests to run in parallel.
 r5384 import BaseHTTPServer, SimpleHTTPServer, os, signal
mpm@selenic.com
commands: report http exceptions nicely...
 r395
def run(server_class=BaseHTTPServer.HTTPServer,
handler_class=SimpleHTTPServer.SimpleHTTPRequestHandler):
Bryan O'Sullivan
Allow tests to run in parallel.
 r5384 server_address = ('localhost', int(os.environ['HGPORT']))
mpm@selenic.com
commands: report http exceptions nicely...
 r395 httpd = server_class(server_address, handler_class)
httpd.serve_forever()
signal.signal(signal.SIGTERM, lambda x: sys.exit(0))
run()
EOF
python dumb.py 2>/dev/null &
Vadim Gelfer
tests: record few more daemon pids to be safe
 r2572 echo $! >> $DAEMON_PIDS
mpm@selenic.com
commands: report http exceptions nicely...
 r395
Alexis S. L. Carvalho
test-bad-pull: try to avoid timing-related failures
 r4317 # give the server some time to start running
sleep 1
Benoit Boissinot
Backed out changeset 490e40816cbd...
 r7919 http_proxy= hg clone http://localhost:$HGPORT/foo copy2 2>&1 | \
Vadim Gelfer
test-bad-pull: fix change in error output.
 r2438 sed -e 's/404.*/404/' -e 's/Date:.*/Date:/'
Benoit Boissinot
Backed out changeset 490e40816cbd...
 r7919 echo $?
mpm@selenic.com
commands: report http exceptions nicely...
 r395
Thomas Arendsen Hein
Use "kill $!" to kill running background processes....
 r492 kill $!