Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-static-http @ 3295:764688cf51e5
merge: remember rename copies and parents properly on commit
record copies in dirstate even if rename was remote
this lets us record it properly at commit
teach checkfilemerge about copies, including merge cases
pull old copy code out of commit
extend rename-merge1 test to show file index
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 08 Oct 2006 19:57:45 -0500 |
parents | 109a22f5434a |
children | 7012c889e8f2 |
rev | line source |
---|---|
1111 | 1 #!/bin/sh |
2 | |
2431
d90a9d7c7d4d
replace old-http:// syntax by static-http:// and deprecate the redundant hg://
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1962
diff
changeset
|
3 http_proxy= hg clone static-http://localhost:20059/ copy |
1111 | 4 echo $? |
1962
2a676ad52c22
tests: more portability fix for the old systems
TK Soh <teekaysoh@yahoo.com>
parents:
1935
diff
changeset
|
5 ls copy 2>/dev/null || echo copy: No such file or directory |
1111 | 6 |
7 # This server doesn't do range requests so it's basically only good for | |
8 # one pull | |
9 cat > dumb.py <<EOF | |
10 import BaseHTTPServer, SimpleHTTPServer, signal | |
11 | |
12 def run(server_class=BaseHTTPServer.HTTPServer, | |
13 handler_class=SimpleHTTPServer.SimpleHTTPRequestHandler): | |
14 server_address = ('localhost', 20059) | |
15 httpd = server_class(server_address, handler_class) | |
16 httpd.serve_forever() | |
17 | |
18 signal.signal(signal.SIGTERM, lambda x: sys.exit(0)) | |
19 run() | |
20 EOF | |
21 | |
22 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
|
23 echo $! >> $DAEMON_PIDS |
1111 | 24 |
25 mkdir remote | |
26 cd remote | |
27 hg init | |
28 echo foo > bar | |
29 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
|
30 hg commit -m"test" -d "1000000 0" |
1111 | 31 hg tip |
32 | |
33 cd .. | |
34 | |
2431
d90a9d7c7d4d
replace old-http:// syntax by static-http:// and deprecate the redundant hg://
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1962
diff
changeset
|
35 http_proxy= hg clone static-http://localhost:20059/remote local |
1111 | 36 |
37 cd local | |
38 hg verify | |
39 cat bar | |
2673
109a22f5434a
hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2571
diff
changeset
|
40 |
109a22f5434a
hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2571
diff
changeset
|
41 cd ../remote |
109a22f5434a
hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2571
diff
changeset
|
42 echo baz > quux |
109a22f5434a
hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2571
diff
changeset
|
43 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
|
44 |
109a22f5434a
hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2571
diff
changeset
|
45 cd ../local |
109a22f5434a
hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2571
diff
changeset
|
46 echo '[hooks]' >> .hg/hgrc |
109a22f5434a
hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2571
diff
changeset
|
47 echo 'changegroup = echo changegroup: u=$HG_URL' >> .hg/hgrc |
1502
1170fef58071
Fixed test-static-http with http_proxy variable set again.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1128
diff
changeset
|
48 http_proxy= hg pull |
1111 | 49 |
50 kill $! |