tests/test-bad-pull
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Thu, 04 Oct 2007 23:21:37 -0300
changeset 5378 8a2915f57dfc
parent 4317 66249be9aa23
child 5384 e3a0c092b4e2
permissions -rwxr-xr-x
convert: add a mode where mercurial_sink skips empty revisions. The getchanges function of some converter_source classes can return some false positives. I.e. they sometimes claim that a file "foo" was changed in some revision, even though its contents are still the same. convert_svn is particularly bad, but I think this can also happen with convert_cvs and, at least in theory, with mercurial_source. For regular conversions this is not really a problem - as long as getfile returns the right contents, we'll get a converted revision with the right contents. But when we use --filemap, this could lead to superfluous revisions being converted. Instead of fixing every converter_source, I decided to change mercurial_sink to work around this problem. When --filemap is used, we're interested only in revisions that touch some specific files. If a revision doesn't change any of these files, then we're not interested in it (at least for revisions with a single parent; merges are special). For mercurial_sink, we abuse this property and rollback a commit if the manifest text hasn't changed. This avoids duplicating the logic from localrepo.filecommit to detect unchanged files.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
800
ec85f9e6f3b1 Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 705
diff changeset
     1
#!/bin/sh
395
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
     2
485
c5705ab9cebd [PATCH] add clone command
mpm@selenic.com
parents: 395
diff changeset
     3
hg clone http://localhost:20059/ copy
503
c6a2e41c8c60 Fix troubles with clone and exception handling
mpm@selenic.com
parents: 495
diff changeset
     4
echo $?
3464
33b6c8193652 Don't use test -e in tests - sh doesn't like it on Solaris
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3418
diff changeset
     5
test -d copy || echo copy: No such file or directory
395
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
     6
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
     7
cat > dumb.py <<EOF
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
     8
import BaseHTTPServer, SimpleHTTPServer, signal
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
     9
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
    10
def run(server_class=BaseHTTPServer.HTTPServer,
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
    11
        handler_class=SimpleHTTPServer.SimpleHTTPRequestHandler):
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
    12
    server_address = ('localhost', 20059)
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
    13
    httpd = server_class(server_address, handler_class)
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
    14
    httpd.serve_forever()
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
    15
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
    16
signal.signal(signal.SIGTERM, lambda x: sys.exit(0))
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
    17
run()
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
    18
EOF
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
    19
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
    20
python dumb.py 2>/dev/null &
2571
d22d730c96ed tests: record few more daemon pids to be safe
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2438
diff changeset
    21
echo $! >> $DAEMON_PIDS
395
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
    22
4317
66249be9aa23 test-bad-pull: try to avoid timing-related failures
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3464
diff changeset
    23
# give the server some time to start running
66249be9aa23 test-bad-pull: try to avoid timing-related failures
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3464
diff changeset
    24
sleep 1
66249be9aa23 test-bad-pull: try to avoid timing-related failures
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3464
diff changeset
    25
2438
a765f853439d test-bad-pull: fix change in error output.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1962
diff changeset
    26
http_proxy= hg clone http://localhost:20059/foo copy2 2>&1 | \
a765f853439d test-bad-pull: fix change in error output.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1962
diff changeset
    27
    sed -e 's/404.*/404/' -e 's/Date:.*/Date:/'
503
c6a2e41c8c60 Fix troubles with clone and exception handling
mpm@selenic.com
parents: 495
diff changeset
    28
echo $?
395
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
    29
492
9bd468e36de3 Use "kill $!" to kill running background processes.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 485
diff changeset
    30
kill $!