Show More
@@ -50,3 +50,4 b' 6344043924497cd06d781d9014c66802285072e4' | |||||
50 | db33555eafeaf9df1e18950e29439eaa706d399b 0 iD8DBQBPGdzxywK+sNU5EO8RAppkAJ9jOXhUVE/97CPgiMA0pMGiIYnesQCfengAszcBiSiKGugiI8Okc9ghU+Y= |
|
50 | db33555eafeaf9df1e18950e29439eaa706d399b 0 iD8DBQBPGdzxywK+sNU5EO8RAppkAJ9jOXhUVE/97CPgiMA0pMGiIYnesQCfengAszcBiSiKGugiI8Okc9ghU+Y= | |
51 | 2aa5b51f310fb3befd26bed99c02267f5c12c734 0 iD8DBQBPKZ9bywK+sNU5EO8RAt1TAJ45r1eJ0YqSkInzrrayg4TVCh0SnQCgm0GA/Ua74jnnDwVQ60lAwROuz1Q= |
|
51 | 2aa5b51f310fb3befd26bed99c02267f5c12c734 0 iD8DBQBPKZ9bywK+sNU5EO8RAt1TAJ45r1eJ0YqSkInzrrayg4TVCh0SnQCgm0GA/Ua74jnnDwVQ60lAwROuz1Q= | |
52 | 53e2cd303ecf8ca7c7eeebd785c34e5ed6b0f4a4 0 iD8DBQBPT/fvywK+sNU5EO8RAnfYAKCn7d0vwqIb100YfWm1F7nFD5B+FACeM02YHpQLSNsztrBCObtqcnfod7Q= |
|
52 | 53e2cd303ecf8ca7c7eeebd785c34e5ed6b0f4a4 0 iD8DBQBPT/fvywK+sNU5EO8RAnfYAKCn7d0vwqIb100YfWm1F7nFD5B+FACeM02YHpQLSNsztrBCObtqcnfod7Q= | |
|
53 | b9bd95e61b49c221c4cca24e6da7c946fc02f992 0 iD8DBQBPeLsIywK+sNU5EO8RAvpNAKCtKe2gitz8dYn52IRF0hFOPCR7AQCfRJL/RWCFweu2T1vH/mUOCf8SXXc= |
@@ -62,3 +62,4 b' 6344043924497cd06d781d9014c66802285072e4' | |||||
62 | db33555eafeaf9df1e18950e29439eaa706d399b 2.1-rc |
|
62 | db33555eafeaf9df1e18950e29439eaa706d399b 2.1-rc | |
63 | 2aa5b51f310fb3befd26bed99c02267f5c12c734 2.1 |
|
63 | 2aa5b51f310fb3befd26bed99c02267f5c12c734 2.1 | |
64 | 53e2cd303ecf8ca7c7eeebd785c34e5ed6b0f4a4 2.1.1 |
|
64 | 53e2cd303ecf8ca7c7eeebd785c34e5ed6b0f4a4 2.1.1 | |
|
65 | b9bd95e61b49c221c4cca24e6da7c946fc02f992 2.1.2 |
@@ -13,12 +13,18 b'' | |||||
13 | > handler_class=SimpleHTTPServer.SimpleHTTPRequestHandler): |
|
13 | > handler_class=SimpleHTTPServer.SimpleHTTPRequestHandler): | |
14 | > server_address = ('localhost', int(os.environ['HGPORT'])) |
|
14 | > server_address = ('localhost', int(os.environ['HGPORT'])) | |
15 | > httpd = server_class(server_address, handler_class) |
|
15 | > httpd = server_class(server_address, handler_class) | |
16 | > os.system("hg clone http://localhost:$HGPORT/foo copy2&") |
|
16 | > open("listening", "w") | |
17 | > httpd.handle_request() |
|
17 | > httpd.handle_request() | |
18 | > run() |
|
18 | > run() | |
19 | > EOF |
|
19 | > EOF | |
20 |
|
20 | |||
21 | $ python dumb.py |
|
21 | $ python dumb.py 2> log & | |
|
22 | $ P=$! | |||
|
23 | $ while [ ! -f listening ]; do true; done | |||
|
24 | $ hg clone http://localhost:$HGPORT/foo copy2 | |||
|
25 | abort: HTTP Error 404: * (glob) | |||
|
26 | [255] | |||
|
27 | $ wait $P | |||
|
28 | $ cat log | |||
22 | localhost - - [*] code 404, message File not found (glob) |
|
29 | localhost - - [*] code 404, message File not found (glob) | |
23 | localhost - - [*] "GET /foo?cmd=capabilities HTTP/1.1" 404 - (glob) |
|
30 | localhost - - [*] "GET /foo?cmd=capabilities HTTP/1.1" 404 - (glob) | |
24 | abort: HTTP Error 404: * (glob) |
|
@@ -519,7 +519,10 b' cleaning up' | |||||
519 | $ hg qpush --move test.patch # already applied |
|
519 | $ hg qpush --move test.patch # already applied | |
520 | abort: cannot push to a previous patch: test.patch |
|
520 | abort: cannot push to a previous patch: test.patch | |
521 | [255] |
|
521 | [255] | |
522 | $ sed -i.bak '2i\# make qtip index different in series and fullseries' `hg root`/.hg/patches/series |
|
522 | $ sed '2i\ | |
|
523 | > # make qtip index different in series and fullseries | |||
|
524 | > ' `hg root`/.hg/patches/series > $TESTTMP/sedtmp | |||
|
525 | $ cp $TESTTMP/sedtmp `hg root`/.hg/patches/series | |||
523 | $ cat `hg root`/.hg/patches/series |
|
526 | $ cat `hg root`/.hg/patches/series | |
524 | # comment |
|
527 | # comment | |
525 | # make qtip index different in series and fullseries |
|
528 | # make qtip index different in series and fullseries | |
@@ -1496,12 +1499,14 b' Test that qfinish respect phases.new-com' | |||||
1496 |
|
1499 | |||
1497 | (restore env for next test) |
|
1500 | (restore env for next test) | |
1498 |
|
1501 | |||
1499 |
$ sed |
|
1502 | $ sed -e 's/new-commit=secret//' $HGRCPATH > $TESTTMP/sedtmp | |
|
1503 | $ cp $TESTTMP/sedtmp $HGRCPATH | |||
1500 | $ hg qimport -r 1 --name add-file2 |
|
1504 | $ hg qimport -r 1 --name add-file2 | |
1501 |
|
1505 | |||
1502 | Test that qfinish preserve phase when mq.secret=false |
|
1506 | Test that qfinish preserve phase when mq.secret=false | |
1503 |
|
1507 | |||
1504 |
$ sed |
|
1508 | $ sed -e 's/secret=true/secret=false/' $HGRCPATH > $TESTTMP/sedtmp | |
|
1509 | $ cp $TESTTMP/sedtmp $HGRCPATH | |||
1505 | $ hg qfinish qbase |
|
1510 | $ hg qfinish qbase | |
1506 | patch add-file2 finalized without changeset message |
|
1511 | patch add-file2 finalized without changeset message | |
1507 | $ hg phase 'all()' |
|
1512 | $ hg phase 'all()' |
General Comments 0
You need to be logged in to leave comments.
Login now