Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-static-http @ 5483:0c43f87baba3 default tip
Fix file-changed-to-dir and dir-to-file commits (issue660).
Allow adding to dirstate files that clash with previously existing
but marked for removal. Protect from reintroducing clashes by revert.
This change doesn't address related issues with update. Current
workaround is to do "clean" update by manually removing conflicting
files/dirs from working directory.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Sat, 27 Oct 2007 16:27:55 +0400 |
parents | e3a0c092b4e2 |
children |
rev | line source |
---|---|
1111 | 1 #!/bin/sh |
2 | |
4290
347766c2ff86
test-static-http: use printenv.py
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3464
diff
changeset
|
3 cp "$TESTDIR"/printenv.py . |
347766c2ff86
test-static-http: use printenv.py
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3464
diff
changeset
|
4 |
5384
e3a0c092b4e2
Allow tests to run in parallel.
Bryan O'Sullivan <bos@serpentine.com>
parents:
5314
diff
changeset
|
5 http_proxy= hg clone static-http://localhost:$HGPORT/ copy |
1111 | 6 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
|
7 test -d copy || echo copy: No such file or directory |
1111 | 8 |
9 # This server doesn't do range requests so it's basically only good for | |
10 # one pull | |
11 cat > dumb.py <<EOF | |
5384
e3a0c092b4e2
Allow tests to run in parallel.
Bryan O'Sullivan <bos@serpentine.com>
parents:
5314
diff
changeset
|
12 import BaseHTTPServer, SimpleHTTPServer, os, signal |
1111 | 13 |
14 def run(server_class=BaseHTTPServer.HTTPServer, | |
15 handler_class=SimpleHTTPServer.SimpleHTTPRequestHandler): | |
5384
e3a0c092b4e2
Allow tests to run in parallel.
Bryan O'Sullivan <bos@serpentine.com>
parents:
5314
diff
changeset
|
16 server_address = ('localhost', int(os.environ['HGPORT'])) |
1111 | 17 httpd = server_class(server_address, handler_class) |
18 httpd.serve_forever() | |
19 | |
20 signal.signal(signal.SIGTERM, lambda x: sys.exit(0)) | |
21 run() | |
22 EOF | |
23 | |
24 python dumb.py 2>/dev/null & | |
2571
d22d730c96ed
tests: record few more daemon pids to be safe
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2431
diff
changeset
|
25 echo $! >> $DAEMON_PIDS |
1111 | 26 |
27 mkdir remote | |
28 cd remote | |
29 hg init | |
30 echo foo > bar | |
31 hg add bar | |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1923
diff
changeset
|
32 hg commit -m"test" -d "1000000 0" |
1111 | 33 hg tip |
34 | |
35 cd .. | |
36 | |
5384
e3a0c092b4e2
Allow tests to run in parallel.
Bryan O'Sullivan <bos@serpentine.com>
parents:
5314
diff
changeset
|
37 http_proxy= hg clone static-http://localhost:$HGPORT/remote local | sed -e 's,:[0-9][0-9]*/,/,' |
1111 | 38 |
39 cd local | |
40 hg verify | |
41 cat bar | |
2673
109a22f5434a
hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2571
diff
changeset
|
42 |
109a22f5434a
hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2571
diff
changeset
|
43 cd ../remote |
109a22f5434a
hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2571
diff
changeset
|
44 echo baz > quux |
109a22f5434a
hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2571
diff
changeset
|
45 hg commit -A -mtest2 -d '100000000 0' |
109a22f5434a
hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2571
diff
changeset
|
46 |
109a22f5434a
hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2571
diff
changeset
|
47 cd ../local |
109a22f5434a
hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2571
diff
changeset
|
48 echo '[hooks]' >> .hg/hgrc |
4290
347766c2ff86
test-static-http: use printenv.py
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3464
diff
changeset
|
49 echo 'changegroup = python ../printenv.py changegroup' >> .hg/hgrc |
5384
e3a0c092b4e2
Allow tests to run in parallel.
Bryan O'Sullivan <bos@serpentine.com>
parents:
5314
diff
changeset
|
50 http_proxy= hg pull | sed -e 's,:[0-9][0-9]*/,/,' |
1111 | 51 |
5314
598dae804a5f
Test static-http calls on '/' URI (issue 747)
Patrick Mezard <pmezard@gmail.com>
parents:
4290
diff
changeset
|
52 echo '% test with "/" URI (issue 747)' |
598dae804a5f
Test static-http calls on '/' URI (issue 747)
Patrick Mezard <pmezard@gmail.com>
parents:
4290
diff
changeset
|
53 cd .. |
598dae804a5f
Test static-http calls on '/' URI (issue 747)
Patrick Mezard <pmezard@gmail.com>
parents:
4290
diff
changeset
|
54 hg init |
598dae804a5f
Test static-http calls on '/' URI (issue 747)
Patrick Mezard <pmezard@gmail.com>
parents:
4290
diff
changeset
|
55 echo a > a |
598dae804a5f
Test static-http calls on '/' URI (issue 747)
Patrick Mezard <pmezard@gmail.com>
parents:
4290
diff
changeset
|
56 hg add a |
598dae804a5f
Test static-http calls on '/' URI (issue 747)
Patrick Mezard <pmezard@gmail.com>
parents:
4290
diff
changeset
|
57 hg ci -ma |
598dae804a5f
Test static-http calls on '/' URI (issue 747)
Patrick Mezard <pmezard@gmail.com>
parents:
4290
diff
changeset
|
58 |
5384
e3a0c092b4e2
Allow tests to run in parallel.
Bryan O'Sullivan <bos@serpentine.com>
parents:
5314
diff
changeset
|
59 http_proxy= hg clone static-http://localhost:$HGPORT/ local2 | sed -e 's,:[0-9][0-9]*/,/,' |
5314
598dae804a5f
Test static-http calls on '/' URI (issue 747)
Patrick Mezard <pmezard@gmail.com>
parents:
4290
diff
changeset
|
60 |
598dae804a5f
Test static-http calls on '/' URI (issue 747)
Patrick Mezard <pmezard@gmail.com>
parents:
4290
diff
changeset
|
61 cd local2 |
598dae804a5f
Test static-http calls on '/' URI (issue 747)
Patrick Mezard <pmezard@gmail.com>
parents:
4290
diff
changeset
|
62 hg verify |
598dae804a5f
Test static-http calls on '/' URI (issue 747)
Patrick Mezard <pmezard@gmail.com>
parents:
4290
diff
changeset
|
63 cat a |
5384
e3a0c092b4e2
Allow tests to run in parallel.
Bryan O'Sullivan <bos@serpentine.com>
parents:
5314
diff
changeset
|
64 hg paths | sed -e 's,:[0-9][0-9]*/,/,' |
5314
598dae804a5f
Test static-http calls on '/' URI (issue 747)
Patrick Mezard <pmezard@gmail.com>
parents:
4290
diff
changeset
|
65 |
1111 | 66 kill $! |