Mercurial > hg
annotate tests/test-push-http.t @ 37845:b4b7427b5786
tests: remove #require killdaemons
The killdaemons hghave feature has returned True since it was
introduced in 448d0c452140. As such, "#require killdaemons" has
no effect and is superfluous. So we remove instances of it.
Differential Revision: https://phab.mercurial-scm.org/D3442
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Mon, 30 Apr 2018 19:54:55 -0700 |
parents | 2968ad548583 |
children | 538e850ae737 |
rev | line source |
---|---|
36242
477280637646
tests: consolidate test-push-http.t and test-push-http-bundle1.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36241
diff
changeset
|
1 #testcases bundle1 bundle2 |
477280637646
tests: consolidate test-push-http.t and test-push-http-bundle1.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36241
diff
changeset
|
2 |
477280637646
tests: consolidate test-push-http.t and test-push-http-bundle1.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36241
diff
changeset
|
3 #if bundle1 |
477280637646
tests: consolidate test-push-http.t and test-push-http-bundle1.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36241
diff
changeset
|
4 $ cat << EOF >> $HGRCPATH |
477280637646
tests: consolidate test-push-http.t and test-push-http-bundle1.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36241
diff
changeset
|
5 > [devel] |
477280637646
tests: consolidate test-push-http.t and test-push-http-bundle1.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36241
diff
changeset
|
6 > # This test is dedicated to interaction through old bundle |
477280637646
tests: consolidate test-push-http.t and test-push-http-bundle1.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36241
diff
changeset
|
7 > legacy.exchange = bundle1 |
477280637646
tests: consolidate test-push-http.t and test-push-http-bundle1.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36241
diff
changeset
|
8 > EOF |
477280637646
tests: consolidate test-push-http.t and test-push-http-bundle1.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36241
diff
changeset
|
9 #endif |
477280637646
tests: consolidate test-push-http.t and test-push-http-bundle1.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36241
diff
changeset
|
10 |
12483
fecd4966f8d4
tests: unify test-push-http
Matt Mackall <mpm@selenic.com>
parents:
11469
diff
changeset
|
11 $ hg init test |
fecd4966f8d4
tests: unify test-push-http
Matt Mackall <mpm@selenic.com>
parents:
11469
diff
changeset
|
12 $ cd test |
fecd4966f8d4
tests: unify test-push-http
Matt Mackall <mpm@selenic.com>
parents:
11469
diff
changeset
|
13 $ echo a > a |
fecd4966f8d4
tests: unify test-push-http
Matt Mackall <mpm@selenic.com>
parents:
11469
diff
changeset
|
14 $ hg ci -Ama |
fecd4966f8d4
tests: unify test-push-http
Matt Mackall <mpm@selenic.com>
parents:
11469
diff
changeset
|
15 adding a |
fecd4966f8d4
tests: unify test-push-http
Matt Mackall <mpm@selenic.com>
parents:
11469
diff
changeset
|
16 $ cd .. |
fecd4966f8d4
tests: unify test-push-http
Matt Mackall <mpm@selenic.com>
parents:
11469
diff
changeset
|
17 $ hg clone test test2 |
fecd4966f8d4
tests: unify test-push-http
Matt Mackall <mpm@selenic.com>
parents:
11469
diff
changeset
|
18 updating to branch default |
fecd4966f8d4
tests: unify test-push-http
Matt Mackall <mpm@selenic.com>
parents:
11469
diff
changeset
|
19 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
fecd4966f8d4
tests: unify test-push-http
Matt Mackall <mpm@selenic.com>
parents:
11469
diff
changeset
|
20 $ cd test2 |
fecd4966f8d4
tests: unify test-push-http
Matt Mackall <mpm@selenic.com>
parents:
11469
diff
changeset
|
21 $ echo a >> a |
fecd4966f8d4
tests: unify test-push-http
Matt Mackall <mpm@selenic.com>
parents:
11469
diff
changeset
|
22 $ hg ci -mb |
fecd4966f8d4
tests: unify test-push-http
Matt Mackall <mpm@selenic.com>
parents:
11469
diff
changeset
|
23 $ req() { |
37414
2d965bfeb8f6
wireproto: allow direct stream processing for unbundle
Joerg Sonnenberger <joerg@bec.de>
parents:
36751
diff
changeset
|
24 > hg $1 serve -p $HGPORT -d --pid-file=hg.pid -E errors.log |
12743
4c4aeaab2339
check-code: add 'no tab indent' check for unified tests
Adrian Buehlmann <adrian@cadifra.com>
parents:
12643
diff
changeset
|
25 > cat hg.pid >> $DAEMON_PIDS |
4c4aeaab2339
check-code: add 'no tab indent' check for unified tests
Adrian Buehlmann <adrian@cadifra.com>
parents:
12643
diff
changeset
|
26 > hg --cwd ../test2 push http://localhost:$HGPORT/ |
17455
2212af23c9de
test-push-http: include exit status of hg push
Yuya Nishihara <yuya@tcha.org>
parents:
17018
diff
changeset
|
27 > exitstatus=$? |
25474
8c14f87bd0ae
tests: drop DAEMON_PIDS from killdaemons calls
Matt Mackall <mpm@selenic.com>
parents:
25472
diff
changeset
|
28 > killdaemons.py |
12743
4c4aeaab2339
check-code: add 'no tab indent' check for unified tests
Adrian Buehlmann <adrian@cadifra.com>
parents:
12643
diff
changeset
|
29 > echo % serve errors |
4c4aeaab2339
check-code: add 'no tab indent' check for unified tests
Adrian Buehlmann <adrian@cadifra.com>
parents:
12643
diff
changeset
|
30 > cat errors.log |
17455
2212af23c9de
test-push-http: include exit status of hg push
Yuya Nishihara <yuya@tcha.org>
parents:
17018
diff
changeset
|
31 > return $exitstatus |
12483
fecd4966f8d4
tests: unify test-push-http
Matt Mackall <mpm@selenic.com>
parents:
11469
diff
changeset
|
32 > } |
fecd4966f8d4
tests: unify test-push-http
Matt Mackall <mpm@selenic.com>
parents:
11469
diff
changeset
|
33 $ cd ../test |
2481
5c65b4e51610
add tests for push over http.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
34 |
12483
fecd4966f8d4
tests: unify test-push-http
Matt Mackall <mpm@selenic.com>
parents:
11469
diff
changeset
|
35 expect ssl error |
fecd4966f8d4
tests: unify test-push-http
Matt Mackall <mpm@selenic.com>
parents:
11469
diff
changeset
|
36 |
fecd4966f8d4
tests: unify test-push-http
Matt Mackall <mpm@selenic.com>
parents:
11469
diff
changeset
|
37 $ req |
12643
d08bb64888bc
tests: reintroduce ":$HGPORT" in test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12483
diff
changeset
|
38 pushing to http://localhost:$HGPORT/ |
12483
fecd4966f8d4
tests: unify test-push-http
Matt Mackall <mpm@selenic.com>
parents:
11469
diff
changeset
|
39 searching for changes |
17456
59a168019255
hgweb: respond 403 forbidden for ssl required error
Yuya Nishihara <yuya@tcha.org>
parents:
17455
diff
changeset
|
40 abort: HTTP Error 403: ssl required |
12483
fecd4966f8d4
tests: unify test-push-http
Matt Mackall <mpm@selenic.com>
parents:
11469
diff
changeset
|
41 % serve errors |
17456
59a168019255
hgweb: respond 403 forbidden for ssl required error
Yuya Nishihara <yuya@tcha.org>
parents:
17455
diff
changeset
|
42 [255] |
12483
fecd4966f8d4
tests: unify test-push-http
Matt Mackall <mpm@selenic.com>
parents:
11469
diff
changeset
|
43 |
fecd4966f8d4
tests: unify test-push-http
Matt Mackall <mpm@selenic.com>
parents:
11469
diff
changeset
|
44 expect authorization error |
6167
f53b9a383476
tests: easier hg serve error diagnosis
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
5386
diff
changeset
|
45 |
12483
fecd4966f8d4
tests: unify test-push-http
Matt Mackall <mpm@selenic.com>
parents:
11469
diff
changeset
|
46 $ echo '[web]' > .hg/hgrc |
fecd4966f8d4
tests: unify test-push-http
Matt Mackall <mpm@selenic.com>
parents:
11469
diff
changeset
|
47 $ echo 'push_ssl = false' >> .hg/hgrc |
fecd4966f8d4
tests: unify test-push-http
Matt Mackall <mpm@selenic.com>
parents:
11469
diff
changeset
|
48 $ req |
12643
d08bb64888bc
tests: reintroduce ":$HGPORT" in test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12483
diff
changeset
|
49 pushing to http://localhost:$HGPORT/ |
12483
fecd4966f8d4
tests: unify test-push-http
Matt Mackall <mpm@selenic.com>
parents:
11469
diff
changeset
|
50 searching for changes |
fecd4966f8d4
tests: unify test-push-http
Matt Mackall <mpm@selenic.com>
parents:
11469
diff
changeset
|
51 abort: authorization failed |
fecd4966f8d4
tests: unify test-push-http
Matt Mackall <mpm@selenic.com>
parents:
11469
diff
changeset
|
52 % serve errors |
17455
2212af23c9de
test-push-http: include exit status of hg push
Yuya Nishihara <yuya@tcha.org>
parents:
17018
diff
changeset
|
53 [255] |
12483
fecd4966f8d4
tests: unify test-push-http
Matt Mackall <mpm@selenic.com>
parents:
11469
diff
changeset
|
54 |
fecd4966f8d4
tests: unify test-push-http
Matt Mackall <mpm@selenic.com>
parents:
11469
diff
changeset
|
55 expect authorization error: must have authorized user |
2481
5c65b4e51610
add tests for push over http.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
56 |
12483
fecd4966f8d4
tests: unify test-push-http
Matt Mackall <mpm@selenic.com>
parents:
11469
diff
changeset
|
57 $ echo 'allow_push = unperson' >> .hg/hgrc |
fecd4966f8d4
tests: unify test-push-http
Matt Mackall <mpm@selenic.com>
parents:
11469
diff
changeset
|
58 $ req |
12643
d08bb64888bc
tests: reintroduce ":$HGPORT" in test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12483
diff
changeset
|
59 pushing to http://localhost:$HGPORT/ |
12483
fecd4966f8d4
tests: unify test-push-http
Matt Mackall <mpm@selenic.com>
parents:
11469
diff
changeset
|
60 searching for changes |
fecd4966f8d4
tests: unify test-push-http
Matt Mackall <mpm@selenic.com>
parents:
11469
diff
changeset
|
61 abort: authorization failed |
fecd4966f8d4
tests: unify test-push-http
Matt Mackall <mpm@selenic.com>
parents:
11469
diff
changeset
|
62 % serve errors |
17455
2212af23c9de
test-push-http: include exit status of hg push
Yuya Nishihara <yuya@tcha.org>
parents:
17018
diff
changeset
|
63 [255] |
2481
5c65b4e51610
add tests for push over http.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
64 |
12483
fecd4966f8d4
tests: unify test-push-http
Matt Mackall <mpm@selenic.com>
parents:
11469
diff
changeset
|
65 expect success |
2481
5c65b4e51610
add tests for push over http.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
66 |
34938
aa05b95949fe
tests: adjust hooks for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
34876
diff
changeset
|
67 $ cat > $TESTTMP/hook.sh <<'EOF' |
aa05b95949fe
tests: adjust hooks for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
34876
diff
changeset
|
68 > echo "phase-move: $HG_NODE: $HG_OLDPHASE -> $HG_PHASE" |
aa05b95949fe
tests: adjust hooks for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
34876
diff
changeset
|
69 > EOF |
aa05b95949fe
tests: adjust hooks for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
34876
diff
changeset
|
70 |
37414
2d965bfeb8f6
wireproto: allow direct stream processing for unbundle
Joerg Sonnenberger <joerg@bec.de>
parents:
36751
diff
changeset
|
71 #if bundle1 |
2d965bfeb8f6
wireproto: allow direct stream processing for unbundle
Joerg Sonnenberger <joerg@bec.de>
parents:
36751
diff
changeset
|
72 $ cat >> .hg/hgrc <<EOF |
2d965bfeb8f6
wireproto: allow direct stream processing for unbundle
Joerg Sonnenberger <joerg@bec.de>
parents:
36751
diff
changeset
|
73 > allow_push = * |
2d965bfeb8f6
wireproto: allow direct stream processing for unbundle
Joerg Sonnenberger <joerg@bec.de>
parents:
36751
diff
changeset
|
74 > [hooks] |
2d965bfeb8f6
wireproto: allow direct stream processing for unbundle
Joerg Sonnenberger <joerg@bec.de>
parents:
36751
diff
changeset
|
75 > changegroup = sh -c "printenv.py changegroup 0" |
2d965bfeb8f6
wireproto: allow direct stream processing for unbundle
Joerg Sonnenberger <joerg@bec.de>
parents:
36751
diff
changeset
|
76 > pushkey = sh -c "printenv.py pushkey 0" |
2d965bfeb8f6
wireproto: allow direct stream processing for unbundle
Joerg Sonnenberger <joerg@bec.de>
parents:
36751
diff
changeset
|
77 > txnclose-phase.test = sh $TESTTMP/hook.sh |
2d965bfeb8f6
wireproto: allow direct stream processing for unbundle
Joerg Sonnenberger <joerg@bec.de>
parents:
36751
diff
changeset
|
78 > EOF |
2d965bfeb8f6
wireproto: allow direct stream processing for unbundle
Joerg Sonnenberger <joerg@bec.de>
parents:
36751
diff
changeset
|
79 $ req "--debug --config extensions.blackbox=" |
37592
fb91757471b5
tests: glob away fqdn wherever we print it
Augie Fackler <augie@google.com>
parents:
37478
diff
changeset
|
80 listening at http://*:$HGPORT/ (bound to $LOCALIP:$HGPORT) (glob) (?) |
37414
2d965bfeb8f6
wireproto: allow direct stream processing for unbundle
Joerg Sonnenberger <joerg@bec.de>
parents:
36751
diff
changeset
|
81 pushing to http://localhost:$HGPORT/ |
2d965bfeb8f6
wireproto: allow direct stream processing for unbundle
Joerg Sonnenberger <joerg@bec.de>
parents:
36751
diff
changeset
|
82 searching for changes |
2d965bfeb8f6
wireproto: allow direct stream processing for unbundle
Joerg Sonnenberger <joerg@bec.de>
parents:
36751
diff
changeset
|
83 remote: redirecting incoming bundle to */hg-unbundle-* (glob) |
2d965bfeb8f6
wireproto: allow direct stream processing for unbundle
Joerg Sonnenberger <joerg@bec.de>
parents:
36751
diff
changeset
|
84 remote: adding changesets |
2d965bfeb8f6
wireproto: allow direct stream processing for unbundle
Joerg Sonnenberger <joerg@bec.de>
parents:
36751
diff
changeset
|
85 remote: add changeset ba677d0156c1 |
2d965bfeb8f6
wireproto: allow direct stream processing for unbundle
Joerg Sonnenberger <joerg@bec.de>
parents:
36751
diff
changeset
|
86 remote: adding manifests |
2d965bfeb8f6
wireproto: allow direct stream processing for unbundle
Joerg Sonnenberger <joerg@bec.de>
parents:
36751
diff
changeset
|
87 remote: adding file changes |
2d965bfeb8f6
wireproto: allow direct stream processing for unbundle
Joerg Sonnenberger <joerg@bec.de>
parents:
36751
diff
changeset
|
88 remote: adding a revisions |
2d965bfeb8f6
wireproto: allow direct stream processing for unbundle
Joerg Sonnenberger <joerg@bec.de>
parents:
36751
diff
changeset
|
89 remote: added 1 changesets with 1 changes to 1 files |
2d965bfeb8f6
wireproto: allow direct stream processing for unbundle
Joerg Sonnenberger <joerg@bec.de>
parents:
36751
diff
changeset
|
90 remote: updating the branch cache |
2d965bfeb8f6
wireproto: allow direct stream processing for unbundle
Joerg Sonnenberger <joerg@bec.de>
parents:
36751
diff
changeset
|
91 remote: running hook txnclose-phase.test: sh $TESTTMP/hook.sh |
2d965bfeb8f6
wireproto: allow direct stream processing for unbundle
Joerg Sonnenberger <joerg@bec.de>
parents:
36751
diff
changeset
|
92 remote: phase-move: cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b: draft -> public |
2d965bfeb8f6
wireproto: allow direct stream processing for unbundle
Joerg Sonnenberger <joerg@bec.de>
parents:
36751
diff
changeset
|
93 remote: running hook txnclose-phase.test: sh $TESTTMP/hook.sh |
2d965bfeb8f6
wireproto: allow direct stream processing for unbundle
Joerg Sonnenberger <joerg@bec.de>
parents:
36751
diff
changeset
|
94 remote: phase-move: ba677d0156c1196c1a699fa53f390dcfc3ce3872: -> public |
2d965bfeb8f6
wireproto: allow direct stream processing for unbundle
Joerg Sonnenberger <joerg@bec.de>
parents:
36751
diff
changeset
|
95 remote: running hook changegroup: sh -c "printenv.py changegroup 0" |
2d965bfeb8f6
wireproto: allow direct stream processing for unbundle
Joerg Sonnenberger <joerg@bec.de>
parents:
36751
diff
changeset
|
96 remote: changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NODE_LAST=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_SOURCE=serve HG_TXNID=TXN:$ID$ HG_URL=remote:http:$LOCALIP: (glob) |
2d965bfeb8f6
wireproto: allow direct stream processing for unbundle
Joerg Sonnenberger <joerg@bec.de>
parents:
36751
diff
changeset
|
97 % serve errors |
2d965bfeb8f6
wireproto: allow direct stream processing for unbundle
Joerg Sonnenberger <joerg@bec.de>
parents:
36751
diff
changeset
|
98 $ hg rollback |
2d965bfeb8f6
wireproto: allow direct stream processing for unbundle
Joerg Sonnenberger <joerg@bec.de>
parents:
36751
diff
changeset
|
99 repository tip rolled back to revision 0 (undo serve) |
2d965bfeb8f6
wireproto: allow direct stream processing for unbundle
Joerg Sonnenberger <joerg@bec.de>
parents:
36751
diff
changeset
|
100 $ req "--debug --config server.streamunbundle=True --config extensions.blackbox=" |
37592
fb91757471b5
tests: glob away fqdn wherever we print it
Augie Fackler <augie@google.com>
parents:
37478
diff
changeset
|
101 listening at http://*:$HGPORT/ (bound to $LOCALIP:$HGPORT) (glob) (?) |
37414
2d965bfeb8f6
wireproto: allow direct stream processing for unbundle
Joerg Sonnenberger <joerg@bec.de>
parents:
36751
diff
changeset
|
102 pushing to http://localhost:$HGPORT/ |
2d965bfeb8f6
wireproto: allow direct stream processing for unbundle
Joerg Sonnenberger <joerg@bec.de>
parents:
36751
diff
changeset
|
103 searching for changes |
2d965bfeb8f6
wireproto: allow direct stream processing for unbundle
Joerg Sonnenberger <joerg@bec.de>
parents:
36751
diff
changeset
|
104 remote: adding changesets |
2d965bfeb8f6
wireproto: allow direct stream processing for unbundle
Joerg Sonnenberger <joerg@bec.de>
parents:
36751
diff
changeset
|
105 remote: add changeset ba677d0156c1 |
2d965bfeb8f6
wireproto: allow direct stream processing for unbundle
Joerg Sonnenberger <joerg@bec.de>
parents:
36751
diff
changeset
|
106 remote: adding manifests |
2d965bfeb8f6
wireproto: allow direct stream processing for unbundle
Joerg Sonnenberger <joerg@bec.de>
parents:
36751
diff
changeset
|
107 remote: adding file changes |
2d965bfeb8f6
wireproto: allow direct stream processing for unbundle
Joerg Sonnenberger <joerg@bec.de>
parents:
36751
diff
changeset
|
108 remote: adding a revisions |
2d965bfeb8f6
wireproto: allow direct stream processing for unbundle
Joerg Sonnenberger <joerg@bec.de>
parents:
36751
diff
changeset
|
109 remote: added 1 changesets with 1 changes to 1 files |
2d965bfeb8f6
wireproto: allow direct stream processing for unbundle
Joerg Sonnenberger <joerg@bec.de>
parents:
36751
diff
changeset
|
110 remote: updating the branch cache |
2d965bfeb8f6
wireproto: allow direct stream processing for unbundle
Joerg Sonnenberger <joerg@bec.de>
parents:
36751
diff
changeset
|
111 remote: running hook txnclose-phase.test: sh $TESTTMP/hook.sh |
2d965bfeb8f6
wireproto: allow direct stream processing for unbundle
Joerg Sonnenberger <joerg@bec.de>
parents:
36751
diff
changeset
|
112 remote: phase-move: cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b: draft -> public |
2d965bfeb8f6
wireproto: allow direct stream processing for unbundle
Joerg Sonnenberger <joerg@bec.de>
parents:
36751
diff
changeset
|
113 remote: running hook txnclose-phase.test: sh $TESTTMP/hook.sh |
2d965bfeb8f6
wireproto: allow direct stream processing for unbundle
Joerg Sonnenberger <joerg@bec.de>
parents:
36751
diff
changeset
|
114 remote: phase-move: ba677d0156c1196c1a699fa53f390dcfc3ce3872: -> public |
2d965bfeb8f6
wireproto: allow direct stream processing for unbundle
Joerg Sonnenberger <joerg@bec.de>
parents:
36751
diff
changeset
|
115 remote: running hook changegroup: sh -c "printenv.py changegroup 0" |
2d965bfeb8f6
wireproto: allow direct stream processing for unbundle
Joerg Sonnenberger <joerg@bec.de>
parents:
36751
diff
changeset
|
116 remote: changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NODE_LAST=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_SOURCE=serve HG_TXNID=TXN:$ID$ HG_URL=remote:http:$LOCALIP: (glob) |
2d965bfeb8f6
wireproto: allow direct stream processing for unbundle
Joerg Sonnenberger <joerg@bec.de>
parents:
36751
diff
changeset
|
117 % serve errors |
2d965bfeb8f6
wireproto: allow direct stream processing for unbundle
Joerg Sonnenberger <joerg@bec.de>
parents:
36751
diff
changeset
|
118 $ hg rollback |
2d965bfeb8f6
wireproto: allow direct stream processing for unbundle
Joerg Sonnenberger <joerg@bec.de>
parents:
36751
diff
changeset
|
119 repository tip rolled back to revision 0 (undo serve) |
2d965bfeb8f6
wireproto: allow direct stream processing for unbundle
Joerg Sonnenberger <joerg@bec.de>
parents:
36751
diff
changeset
|
120 #endif |
2d965bfeb8f6
wireproto: allow direct stream processing for unbundle
Joerg Sonnenberger <joerg@bec.de>
parents:
36751
diff
changeset
|
121 |
2d965bfeb8f6
wireproto: allow direct stream processing for unbundle
Joerg Sonnenberger <joerg@bec.de>
parents:
36751
diff
changeset
|
122 #if bundle2 |
30234
34a5f6c66bc5
tests: invoke printenv.py via sh -c for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
27739
diff
changeset
|
123 $ cat >> .hg/hgrc <<EOF |
34a5f6c66bc5
tests: invoke printenv.py via sh -c for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
27739
diff
changeset
|
124 > allow_push = * |
34a5f6c66bc5
tests: invoke printenv.py via sh -c for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
27739
diff
changeset
|
125 > [hooks] |
34a5f6c66bc5
tests: invoke printenv.py via sh -c for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
27739
diff
changeset
|
126 > changegroup = sh -c "printenv.py changegroup 0" |
34a5f6c66bc5
tests: invoke printenv.py via sh -c for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
27739
diff
changeset
|
127 > pushkey = sh -c "printenv.py pushkey 0" |
34938
aa05b95949fe
tests: adjust hooks for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
34876
diff
changeset
|
128 > txnclose-phase.test = sh $TESTTMP/hook.sh |
30234
34a5f6c66bc5
tests: invoke printenv.py via sh -c for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
27739
diff
changeset
|
129 > EOF |
12483
fecd4966f8d4
tests: unify test-push-http
Matt Mackall <mpm@selenic.com>
parents:
11469
diff
changeset
|
130 $ req |
12643
d08bb64888bc
tests: reintroduce ":$HGPORT" in test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12483
diff
changeset
|
131 pushing to http://localhost:$HGPORT/ |
12483
fecd4966f8d4
tests: unify test-push-http
Matt Mackall <mpm@selenic.com>
parents:
11469
diff
changeset
|
132 searching for changes |
fecd4966f8d4
tests: unify test-push-http
Matt Mackall <mpm@selenic.com>
parents:
11469
diff
changeset
|
133 remote: adding changesets |
fecd4966f8d4
tests: unify test-push-http
Matt Mackall <mpm@selenic.com>
parents:
11469
diff
changeset
|
134 remote: adding manifests |
fecd4966f8d4
tests: unify test-push-http
Matt Mackall <mpm@selenic.com>
parents:
11469
diff
changeset
|
135 remote: adding file changes |
fecd4966f8d4
tests: unify test-push-http
Matt Mackall <mpm@selenic.com>
parents:
11469
diff
changeset
|
136 remote: added 1 changesets with 1 changes to 1 files |
34876
eb1b964b354b
phases: pass phase names to hooks instead of internal values
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
34836
diff
changeset
|
137 remote: phase-move: cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b: draft -> public |
eb1b964b354b
phases: pass phase names to hooks instead of internal values
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
34836
diff
changeset
|
138 remote: phase-move: ba677d0156c1196c1a699fa53f390dcfc3ce3872: -> public |
37414
2d965bfeb8f6
wireproto: allow direct stream processing for unbundle
Joerg Sonnenberger <joerg@bec.de>
parents:
36751
diff
changeset
|
139 remote: changegroup hook: HG_BUNDLE2=1 HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NODE_LAST=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_SOURCE=serve HG_TXNID=TXN:$ID$ HG_URL=remote:http:$LOCALIP: (glob) |
12483
fecd4966f8d4
tests: unify test-push-http
Matt Mackall <mpm@selenic.com>
parents:
11469
diff
changeset
|
140 % serve errors |
fecd4966f8d4
tests: unify test-push-http
Matt Mackall <mpm@selenic.com>
parents:
11469
diff
changeset
|
141 $ hg rollback |
13446
1e497df514e2
rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents:
13405
diff
changeset
|
142 repository tip rolled back to revision 0 (undo serve) |
37414
2d965bfeb8f6
wireproto: allow direct stream processing for unbundle
Joerg Sonnenberger <joerg@bec.de>
parents:
36751
diff
changeset
|
143 #endif |
12483
fecd4966f8d4
tests: unify test-push-http
Matt Mackall <mpm@selenic.com>
parents:
11469
diff
changeset
|
144 |
14093
ce99d887585f
httprepo: long arguments support (issue2126)
Steven Brown <StevenGBrown@gmail.com>
parents:
14011
diff
changeset
|
145 expect success, server lacks the httpheader capability |
ce99d887585f
httprepo: long arguments support (issue2126)
Steven Brown <StevenGBrown@gmail.com>
parents:
14011
diff
changeset
|
146 |
ce99d887585f
httprepo: long arguments support (issue2126)
Steven Brown <StevenGBrown@gmail.com>
parents:
14011
diff
changeset
|
147 $ CAP=httpheader |
ce99d887585f
httprepo: long arguments support (issue2126)
Steven Brown <StevenGBrown@gmail.com>
parents:
14011
diff
changeset
|
148 $ . "$TESTDIR/notcapable" |
ce99d887585f
httprepo: long arguments support (issue2126)
Steven Brown <StevenGBrown@gmail.com>
parents:
14011
diff
changeset
|
149 $ req |
ce99d887585f
httprepo: long arguments support (issue2126)
Steven Brown <StevenGBrown@gmail.com>
parents:
14011
diff
changeset
|
150 pushing to http://localhost:$HGPORT/ |
ce99d887585f
httprepo: long arguments support (issue2126)
Steven Brown <StevenGBrown@gmail.com>
parents:
14011
diff
changeset
|
151 searching for changes |
ce99d887585f
httprepo: long arguments support (issue2126)
Steven Brown <StevenGBrown@gmail.com>
parents:
14011
diff
changeset
|
152 remote: adding changesets |
ce99d887585f
httprepo: long arguments support (issue2126)
Steven Brown <StevenGBrown@gmail.com>
parents:
14011
diff
changeset
|
153 remote: adding manifests |
ce99d887585f
httprepo: long arguments support (issue2126)
Steven Brown <StevenGBrown@gmail.com>
parents:
14011
diff
changeset
|
154 remote: adding file changes |
ce99d887585f
httprepo: long arguments support (issue2126)
Steven Brown <StevenGBrown@gmail.com>
parents:
14011
diff
changeset
|
155 remote: added 1 changesets with 1 changes to 1 files |
34876
eb1b964b354b
phases: pass phase names to hooks instead of internal values
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
34836
diff
changeset
|
156 remote: phase-move: cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b: draft -> public |
eb1b964b354b
phases: pass phase names to hooks instead of internal values
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
34836
diff
changeset
|
157 remote: phase-move: ba677d0156c1196c1a699fa53f390dcfc3ce3872: -> public |
36242
477280637646
tests: consolidate test-push-http.t and test-push-http-bundle1.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36241
diff
changeset
|
158 remote: changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NODE_LAST=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_SOURCE=serve HG_TXNID=TXN:$ID$ HG_URL=remote:http:$LOCALIP: (glob) (bundle1 !) |
477280637646
tests: consolidate test-push-http.t and test-push-http-bundle1.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36241
diff
changeset
|
159 remote: changegroup hook: HG_BUNDLE2=1 HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NODE_LAST=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_SOURCE=serve HG_TXNID=TXN:$ID$ HG_URL=remote:http:$LOCALIP: (glob) (bundle2 !) |
14093
ce99d887585f
httprepo: long arguments support (issue2126)
Steven Brown <StevenGBrown@gmail.com>
parents:
14011
diff
changeset
|
160 % serve errors |
ce99d887585f
httprepo: long arguments support (issue2126)
Steven Brown <StevenGBrown@gmail.com>
parents:
14011
diff
changeset
|
161 $ hg rollback |
ce99d887585f
httprepo: long arguments support (issue2126)
Steven Brown <StevenGBrown@gmail.com>
parents:
14011
diff
changeset
|
162 repository tip rolled back to revision 0 (undo serve) |
ce99d887585f
httprepo: long arguments support (issue2126)
Steven Brown <StevenGBrown@gmail.com>
parents:
14011
diff
changeset
|
163 |
13946
3c2f9f611ef6
tests: new test cases for the unbundlehash capability
Steven Brown <StevenGBrown@gmail.com>
parents:
13449
diff
changeset
|
164 expect success, server lacks the unbundlehash capability |
3c2f9f611ef6
tests: new test cases for the unbundlehash capability
Steven Brown <StevenGBrown@gmail.com>
parents:
13449
diff
changeset
|
165 |
14011
b69471bdb678
tests: add script to disable a selected wire protocol capability
Steven Brown <StevenGBrown@gmail.com>
parents:
13946
diff
changeset
|
166 $ CAP=unbundlehash |
b69471bdb678
tests: add script to disable a selected wire protocol capability
Steven Brown <StevenGBrown@gmail.com>
parents:
13946
diff
changeset
|
167 $ . "$TESTDIR/notcapable" |
13946
3c2f9f611ef6
tests: new test cases for the unbundlehash capability
Steven Brown <StevenGBrown@gmail.com>
parents:
13449
diff
changeset
|
168 $ req |
3c2f9f611ef6
tests: new test cases for the unbundlehash capability
Steven Brown <StevenGBrown@gmail.com>
parents:
13449
diff
changeset
|
169 pushing to http://localhost:$HGPORT/ |
3c2f9f611ef6
tests: new test cases for the unbundlehash capability
Steven Brown <StevenGBrown@gmail.com>
parents:
13449
diff
changeset
|
170 searching for changes |
3c2f9f611ef6
tests: new test cases for the unbundlehash capability
Steven Brown <StevenGBrown@gmail.com>
parents:
13449
diff
changeset
|
171 remote: adding changesets |
3c2f9f611ef6
tests: new test cases for the unbundlehash capability
Steven Brown <StevenGBrown@gmail.com>
parents:
13449
diff
changeset
|
172 remote: adding manifests |
3c2f9f611ef6
tests: new test cases for the unbundlehash capability
Steven Brown <StevenGBrown@gmail.com>
parents:
13449
diff
changeset
|
173 remote: adding file changes |
3c2f9f611ef6
tests: new test cases for the unbundlehash capability
Steven Brown <StevenGBrown@gmail.com>
parents:
13449
diff
changeset
|
174 remote: added 1 changesets with 1 changes to 1 files |
34876
eb1b964b354b
phases: pass phase names to hooks instead of internal values
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
34836
diff
changeset
|
175 remote: phase-move: cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b: draft -> public |
eb1b964b354b
phases: pass phase names to hooks instead of internal values
Kevin Bullock <kbullock+mercurial@ringworld.org>
parents:
34836
diff
changeset
|
176 remote: phase-move: ba677d0156c1196c1a699fa53f390dcfc3ce3872: -> public |
36242
477280637646
tests: consolidate test-push-http.t and test-push-http-bundle1.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36241
diff
changeset
|
177 remote: changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NODE_LAST=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_SOURCE=serve HG_TXNID=TXN:$ID$ HG_URL=remote:http:$LOCALIP: (glob) (bundle1 !) |
477280637646
tests: consolidate test-push-http.t and test-push-http-bundle1.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36241
diff
changeset
|
178 remote: changegroup hook: HG_BUNDLE2=1 HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NODE_LAST=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_SOURCE=serve HG_TXNID=TXN:$ID$ HG_URL=remote:http:$LOCALIP: (glob) (bundle2 !) |
13946
3c2f9f611ef6
tests: new test cases for the unbundlehash capability
Steven Brown <StevenGBrown@gmail.com>
parents:
13449
diff
changeset
|
179 % serve errors |
3c2f9f611ef6
tests: new test cases for the unbundlehash capability
Steven Brown <StevenGBrown@gmail.com>
parents:
13449
diff
changeset
|
180 $ hg rollback |
3c2f9f611ef6
tests: new test cases for the unbundlehash capability
Steven Brown <StevenGBrown@gmail.com>
parents:
13449
diff
changeset
|
181 repository tip rolled back to revision 0 (undo serve) |
3c2f9f611ef6
tests: new test cases for the unbundlehash capability
Steven Brown <StevenGBrown@gmail.com>
parents:
13449
diff
changeset
|
182 |
36241
fefd57bd9573
tests: port value-less unbundle capability test to test-push-http.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34938
diff
changeset
|
183 expect success, pre-d1b16a746db6 server supports the unbundle capability, but |
fefd57bd9573
tests: port value-less unbundle capability test to test-push-http.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34938
diff
changeset
|
184 has no parameter |
fefd57bd9573
tests: port value-less unbundle capability test to test-push-http.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34938
diff
changeset
|
185 |
fefd57bd9573
tests: port value-less unbundle capability test to test-push-http.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34938
diff
changeset
|
186 $ cat <<EOF > notcapable-unbundleparam.py |
fefd57bd9573
tests: port value-less unbundle capability test to test-push-http.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34938
diff
changeset
|
187 > from mercurial import extensions, httppeer |
fefd57bd9573
tests: port value-less unbundle capability test to test-push-http.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34938
diff
changeset
|
188 > def capable(orig, self, name): |
fefd57bd9573
tests: port value-less unbundle capability test to test-push-http.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34938
diff
changeset
|
189 > if name == 'unbundle': |
fefd57bd9573
tests: port value-less unbundle capability test to test-push-http.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34938
diff
changeset
|
190 > return True |
fefd57bd9573
tests: port value-less unbundle capability test to test-push-http.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34938
diff
changeset
|
191 > return orig(self, name) |
fefd57bd9573
tests: port value-less unbundle capability test to test-push-http.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34938
diff
changeset
|
192 > def uisetup(ui): |
fefd57bd9573
tests: port value-less unbundle capability test to test-push-http.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34938
diff
changeset
|
193 > extensions.wrapfunction(httppeer.httppeer, 'capable', capable) |
fefd57bd9573
tests: port value-less unbundle capability test to test-push-http.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34938
diff
changeset
|
194 > EOF |
fefd57bd9573
tests: port value-less unbundle capability test to test-push-http.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34938
diff
changeset
|
195 $ cp $HGRCPATH $HGRCPATH.orig |
fefd57bd9573
tests: port value-less unbundle capability test to test-push-http.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34938
diff
changeset
|
196 $ cat <<EOF >> $HGRCPATH |
fefd57bd9573
tests: port value-less unbundle capability test to test-push-http.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34938
diff
changeset
|
197 > [extensions] |
fefd57bd9573
tests: port value-less unbundle capability test to test-push-http.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34938
diff
changeset
|
198 > notcapable-unbundleparam = `pwd`/notcapable-unbundleparam.py |
fefd57bd9573
tests: port value-less unbundle capability test to test-push-http.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34938
diff
changeset
|
199 > EOF |
fefd57bd9573
tests: port value-less unbundle capability test to test-push-http.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34938
diff
changeset
|
200 $ req |
fefd57bd9573
tests: port value-less unbundle capability test to test-push-http.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34938
diff
changeset
|
201 pushing to http://localhost:$HGPORT/ |
fefd57bd9573
tests: port value-less unbundle capability test to test-push-http.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34938
diff
changeset
|
202 searching for changes |
fefd57bd9573
tests: port value-less unbundle capability test to test-push-http.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34938
diff
changeset
|
203 remote: adding changesets |
fefd57bd9573
tests: port value-less unbundle capability test to test-push-http.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34938
diff
changeset
|
204 remote: adding manifests |
fefd57bd9573
tests: port value-less unbundle capability test to test-push-http.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34938
diff
changeset
|
205 remote: adding file changes |
fefd57bd9573
tests: port value-less unbundle capability test to test-push-http.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34938
diff
changeset
|
206 remote: added 1 changesets with 1 changes to 1 files |
fefd57bd9573
tests: port value-less unbundle capability test to test-push-http.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34938
diff
changeset
|
207 remote: phase-move: cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b: draft -> public |
fefd57bd9573
tests: port value-less unbundle capability test to test-push-http.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34938
diff
changeset
|
208 remote: phase-move: ba677d0156c1196c1a699fa53f390dcfc3ce3872: -> public |
fefd57bd9573
tests: port value-less unbundle capability test to test-push-http.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34938
diff
changeset
|
209 remote: changegroup hook: * (glob) |
fefd57bd9573
tests: port value-less unbundle capability test to test-push-http.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34938
diff
changeset
|
210 % serve errors |
fefd57bd9573
tests: port value-less unbundle capability test to test-push-http.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34938
diff
changeset
|
211 $ hg rollback |
fefd57bd9573
tests: port value-less unbundle capability test to test-push-http.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34938
diff
changeset
|
212 repository tip rolled back to revision 0 (undo serve) |
fefd57bd9573
tests: port value-less unbundle capability test to test-push-http.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34938
diff
changeset
|
213 $ mv $HGRCPATH.orig $HGRCPATH |
fefd57bd9573
tests: port value-less unbundle capability test to test-push-http.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34938
diff
changeset
|
214 |
36243
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
215 Test pushing to a publishing repository with a failing prepushkey hook |
17793
8474be4412ca
wireproto: fix pushkey hook failure and output on remote http repo
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
17565
diff
changeset
|
216 |
17842
a029dac38942
test-push-http: fix failing test on Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
17793
diff
changeset
|
217 $ cat > .hg/hgrc <<EOF |
a029dac38942
test-push-http: fix failing test on Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
17793
diff
changeset
|
218 > [web] |
a029dac38942
test-push-http: fix failing test on Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
17793
diff
changeset
|
219 > push_ssl = false |
a029dac38942
test-push-http: fix failing test on Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
17793
diff
changeset
|
220 > allow_push = * |
a029dac38942
test-push-http: fix failing test on Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
17793
diff
changeset
|
221 > [hooks] |
30234
34a5f6c66bc5
tests: invoke printenv.py via sh -c for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
27739
diff
changeset
|
222 > prepushkey = sh -c "printenv.py prepushkey 1" |
34836
537de0b14030
phase: use a binary phase part to push through bundle2 (BC)
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
223 > [devel] |
537de0b14030
phase: use a binary phase part to push through bundle2 (BC)
Boris Feld <boris.feld@octobus.net>
parents:
34710
diff
changeset
|
224 > legacy.exchange=phases |
17842
a029dac38942
test-push-http: fix failing test on Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
17793
diff
changeset
|
225 > EOF |
36242
477280637646
tests: consolidate test-push-http.t and test-push-http-bundle1.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36241
diff
changeset
|
226 |
477280637646
tests: consolidate test-push-http.t and test-push-http-bundle1.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36241
diff
changeset
|
227 #if bundle1 |
36243
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
228 Bundle1 works because a) phases are updated as part of changegroup application |
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
229 and b) client checks phases after the "unbundle" command. Since it sees no |
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
230 phase changes are necessary, it doesn't send the "pushkey" command and the |
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
231 prepushkey hook never has to fire. |
36242
477280637646
tests: consolidate test-push-http.t and test-push-http-bundle1.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36241
diff
changeset
|
232 |
477280637646
tests: consolidate test-push-http.t and test-push-http-bundle1.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36241
diff
changeset
|
233 $ req |
477280637646
tests: consolidate test-push-http.t and test-push-http-bundle1.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36241
diff
changeset
|
234 pushing to http://localhost:$HGPORT/ |
477280637646
tests: consolidate test-push-http.t and test-push-http-bundle1.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36241
diff
changeset
|
235 searching for changes |
477280637646
tests: consolidate test-push-http.t and test-push-http-bundle1.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36241
diff
changeset
|
236 remote: adding changesets |
477280637646
tests: consolidate test-push-http.t and test-push-http-bundle1.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36241
diff
changeset
|
237 remote: adding manifests |
477280637646
tests: consolidate test-push-http.t and test-push-http-bundle1.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36241
diff
changeset
|
238 remote: adding file changes |
477280637646
tests: consolidate test-push-http.t and test-push-http-bundle1.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36241
diff
changeset
|
239 remote: added 1 changesets with 1 changes to 1 files |
477280637646
tests: consolidate test-push-http.t and test-push-http-bundle1.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36241
diff
changeset
|
240 % serve errors |
477280637646
tests: consolidate test-push-http.t and test-push-http-bundle1.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36241
diff
changeset
|
241 |
477280637646
tests: consolidate test-push-http.t and test-push-http-bundle1.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36241
diff
changeset
|
242 #endif |
477280637646
tests: consolidate test-push-http.t and test-push-http-bundle1.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36241
diff
changeset
|
243 |
477280637646
tests: consolidate test-push-http.t and test-push-http-bundle1.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36241
diff
changeset
|
244 #if bundle2 |
36243
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
245 Bundle2 sends a "pushkey" bundle2 part. This runs as part of the transaction |
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
246 and fails the entire push. |
17793
8474be4412ca
wireproto: fix pushkey hook failure and output on remote http repo
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
17565
diff
changeset
|
247 $ req |
8474be4412ca
wireproto: fix pushkey hook failure and output on remote http repo
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
17565
diff
changeset
|
248 pushing to http://localhost:$HGPORT/ |
8474be4412ca
wireproto: fix pushkey hook failure and output on remote http repo
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
17565
diff
changeset
|
249 searching for changes |
8474be4412ca
wireproto: fix pushkey hook failure and output on remote http repo
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
17565
diff
changeset
|
250 remote: adding changesets |
8474be4412ca
wireproto: fix pushkey hook failure and output on remote http repo
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
17565
diff
changeset
|
251 remote: adding manifests |
8474be4412ca
wireproto: fix pushkey hook failure and output on remote http repo
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
17565
diff
changeset
|
252 remote: adding file changes |
8474be4412ca
wireproto: fix pushkey hook failure and output on remote http repo
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
17565
diff
changeset
|
253 remote: added 1 changesets with 1 changes to 1 files |
31815
7937dabb5447
tests: fix missing (glob) annotations in test-push-http.t
Augie Fackler <augie@google.com>
parents:
31747
diff
changeset
|
254 remote: prepushkey hook: HG_BUNDLE2=1 HG_HOOKNAME=prepushkey HG_HOOKTYPE=prepushkey HG_KEY=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NAMESPACE=phases HG_NEW=0 HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NODE_LAST=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_OLD=1 HG_PENDING=$TESTTMP/test HG_PHASES_MOVED=1 HG_SOURCE=serve HG_TXNID=TXN:$ID$ HG_URL=remote:http:$LOCALIP: (glob) |
25390
14c6b4c6e3f9
test: use bundle2 in test-push-http
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24740
diff
changeset
|
255 remote: pushkey-abort: prepushkey hook exited with status 1 |
25502
bd41c19383db
phases: abort the whole push if phases fail to update (BC)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25478
diff
changeset
|
256 remote: transaction abort! |
bd41c19383db
phases: abort the whole push if phases fail to update (BC)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25478
diff
changeset
|
257 remote: rollback completed |
bd41c19383db
phases: abort the whole push if phases fail to update (BC)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25478
diff
changeset
|
258 abort: updating ba677d0156c1 to public failed |
17793
8474be4412ca
wireproto: fix pushkey hook failure and output on remote http repo
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
17565
diff
changeset
|
259 % serve errors |
25502
bd41c19383db
phases: abort the whole push if phases fail to update (BC)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25478
diff
changeset
|
260 [255] |
17793
8474be4412ca
wireproto: fix pushkey hook failure and output on remote http repo
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
17565
diff
changeset
|
261 |
36242
477280637646
tests: consolidate test-push-http.t and test-push-http-bundle1.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36241
diff
changeset
|
262 #endif |
477280637646
tests: consolidate test-push-http.t and test-push-http-bundle1.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36241
diff
changeset
|
263 |
36243
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
264 Now remove the failing prepushkey hook. |
17793
8474be4412ca
wireproto: fix pushkey hook failure and output on remote http repo
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
17565
diff
changeset
|
265 |
30234
34a5f6c66bc5
tests: invoke printenv.py via sh -c for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
27739
diff
changeset
|
266 $ cat >> .hg/hgrc <<EOF |
36242
477280637646
tests: consolidate test-push-http.t and test-push-http-bundle1.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36241
diff
changeset
|
267 > [hooks] |
30234
34a5f6c66bc5
tests: invoke printenv.py via sh -c for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
27739
diff
changeset
|
268 > prepushkey = sh -c "printenv.py prepushkey 0" |
34a5f6c66bc5
tests: invoke printenv.py via sh -c for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
27739
diff
changeset
|
269 > EOF |
36242
477280637646
tests: consolidate test-push-http.t and test-push-http-bundle1.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36241
diff
changeset
|
270 |
36243
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
271 We don't need to test bundle1 because it succeeded above. |
36242
477280637646
tests: consolidate test-push-http.t and test-push-http-bundle1.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36241
diff
changeset
|
272 |
36243
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
273 #if bundle2 |
36242
477280637646
tests: consolidate test-push-http.t and test-push-http-bundle1.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36241
diff
changeset
|
274 $ req |
477280637646
tests: consolidate test-push-http.t and test-push-http-bundle1.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36241
diff
changeset
|
275 pushing to http://localhost:$HGPORT/ |
477280637646
tests: consolidate test-push-http.t and test-push-http-bundle1.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36241
diff
changeset
|
276 searching for changes |
36243
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
277 remote: adding changesets |
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
278 remote: adding manifests |
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
279 remote: adding file changes |
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
280 remote: added 1 changesets with 1 changes to 1 files |
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
281 remote: prepushkey hook: HG_BUNDLE2=1 HG_HOOKNAME=prepushkey HG_HOOKTYPE=prepushkey HG_KEY=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NAMESPACE=phases HG_NEW=0 HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NODE_LAST=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_OLD=1 HG_PENDING=$TESTTMP/test HG_PHASES_MOVED=1 HG_SOURCE=serve HG_TXNID=TXN:$ID$ HG_URL=remote:http:$LOCALIP: (glob) |
36242
477280637646
tests: consolidate test-push-http.t and test-push-http-bundle1.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36241
diff
changeset
|
282 % serve errors |
477280637646
tests: consolidate test-push-http.t and test-push-http-bundle1.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36241
diff
changeset
|
283 #endif |
477280637646
tests: consolidate test-push-http.t and test-push-http-bundle1.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36241
diff
changeset
|
284 |
36243
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
285 $ hg --config extensions.strip= strip -r 1: |
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
286 saved backup bundle to $TESTTMP/test/.hg/strip-backup/ba677d0156c1-eea704d7-backup.hg |
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
287 |
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
288 Now do a variant of the above, except on a non-publishing repository |
36242
477280637646
tests: consolidate test-push-http.t and test-push-http-bundle1.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36241
diff
changeset
|
289 |
36243
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
290 $ cat >> .hg/hgrc <<EOF |
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
291 > [phases] |
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
292 > publish = false |
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
293 > [hooks] |
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
294 > prepushkey = sh -c "printenv.py prepushkey 1" |
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
295 > EOF |
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
296 |
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
297 #if bundle1 |
17793
8474be4412ca
wireproto: fix pushkey hook failure and output on remote http repo
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
17565
diff
changeset
|
298 $ req |
8474be4412ca
wireproto: fix pushkey hook failure and output on remote http repo
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
17565
diff
changeset
|
299 pushing to http://localhost:$HGPORT/ |
8474be4412ca
wireproto: fix pushkey hook failure and output on remote http repo
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
17565
diff
changeset
|
300 searching for changes |
25502
bd41c19383db
phases: abort the whole push if phases fail to update (BC)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25478
diff
changeset
|
301 remote: adding changesets |
bd41c19383db
phases: abort the whole push if phases fail to update (BC)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25478
diff
changeset
|
302 remote: adding manifests |
bd41c19383db
phases: abort the whole push if phases fail to update (BC)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25478
diff
changeset
|
303 remote: adding file changes |
bd41c19383db
phases: abort the whole push if phases fail to update (BC)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25478
diff
changeset
|
304 remote: added 1 changesets with 1 changes to 1 files |
36243
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
305 remote: prepushkey hook: HG_HOOKNAME=prepushkey HG_HOOKTYPE=prepushkey HG_KEY=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NAMESPACE=phases HG_NEW=0 HG_OLD=1 |
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
306 remote: pushkey-abort: prepushkey hook exited with status 1 |
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
307 updating ba677d0156c1 to public failed! |
17793
8474be4412ca
wireproto: fix pushkey hook failure and output on remote http repo
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
17565
diff
changeset
|
308 % serve errors |
36243
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
309 #endif |
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
310 |
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
311 #if bundle2 |
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
312 $ req |
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
313 pushing to http://localhost:$HGPORT/ |
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
314 searching for changes |
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
315 remote: adding changesets |
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
316 remote: adding manifests |
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
317 remote: adding file changes |
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
318 remote: added 1 changesets with 1 changes to 1 files |
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
319 remote: prepushkey hook: HG_BUNDLE2=1 HG_HOOKNAME=prepushkey HG_HOOKTYPE=prepushkey HG_KEY=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NAMESPACE=phases HG_NEW=0 HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NODE_LAST=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_OLD=1 HG_PENDING=$TESTTMP/test HG_PHASES_MOVED=1 HG_SOURCE=serve HG_TXNID=TXN:$ID$ HG_URL=remote:http:$LOCALIP: (glob) |
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
320 remote: pushkey-abort: prepushkey hook exited with status 1 |
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
321 remote: transaction abort! |
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
322 remote: rollback completed |
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
323 abort: updating ba677d0156c1 to public failed |
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
324 % serve errors |
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
325 [255] |
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
326 #endif |
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
327 |
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
328 Make phases updates work |
17793
8474be4412ca
wireproto: fix pushkey hook failure and output on remote http repo
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
17565
diff
changeset
|
329 |
36243
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
330 $ cat >> .hg/hgrc <<EOF |
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
331 > [hooks] |
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
332 > prepushkey = sh -c "printenv.py prepushkey 0" |
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
333 > EOF |
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
334 |
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
335 #if bundle1 |
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
336 $ req |
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
337 pushing to http://localhost:$HGPORT/ |
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
338 searching for changes |
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
339 no changes found |
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
340 remote: prepushkey hook: HG_HOOKNAME=prepushkey HG_HOOKTYPE=prepushkey HG_KEY=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NAMESPACE=phases HG_NEW=0 HG_OLD=1 |
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
341 % serve errors |
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
342 [1] |
36242
477280637646
tests: consolidate test-push-http.t and test-push-http-bundle1.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36241
diff
changeset
|
343 #endif |
477280637646
tests: consolidate test-push-http.t and test-push-http-bundle1.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36241
diff
changeset
|
344 |
36243
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
345 #if bundle2 |
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
346 $ req |
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
347 pushing to http://localhost:$HGPORT/ |
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
348 searching for changes |
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
349 remote: adding changesets |
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
350 remote: adding manifests |
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
351 remote: adding file changes |
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
352 remote: added 1 changesets with 1 changes to 1 files |
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
353 remote: prepushkey hook: HG_BUNDLE2=1 HG_HOOKNAME=prepushkey HG_HOOKTYPE=prepushkey HG_KEY=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NAMESPACE=phases HG_NEW=0 HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NODE_LAST=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_OLD=1 HG_PENDING=$TESTTMP/test HG_PHASES_MOVED=1 HG_SOURCE=serve HG_TXNID=TXN:$ID$ HG_URL=remote:http:$LOCALIP: (glob) |
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
354 % serve errors |
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
355 #endif |
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
356 |
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
357 $ hg --config extensions.strip= strip -r 1: |
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
358 saved backup bundle to $TESTTMP/test/.hg/strip-backup/ba677d0156c1-eea704d7-backup.hg |
c19e66dacaa1
tests: expand test coverage for updating phases
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36242
diff
changeset
|
359 |
36242
477280637646
tests: consolidate test-push-http.t and test-push-http-bundle1.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36241
diff
changeset
|
360 #if bundle2 |
477280637646
tests: consolidate test-push-http.t and test-push-http-bundle1.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36241
diff
changeset
|
361 |
33700
970967e0a917
http: add a test of actually pushing with httppostargs
Augie Fackler <augie@google.com>
parents:
31815
diff
changeset
|
362 $ cat > .hg/hgrc <<EOF |
970967e0a917
http: add a test of actually pushing with httppostargs
Augie Fackler <augie@google.com>
parents:
31815
diff
changeset
|
363 > [web] |
970967e0a917
http: add a test of actually pushing with httppostargs
Augie Fackler <augie@google.com>
parents:
31815
diff
changeset
|
364 > push_ssl = false |
970967e0a917
http: add a test of actually pushing with httppostargs
Augie Fackler <augie@google.com>
parents:
31815
diff
changeset
|
365 > allow_push = * |
970967e0a917
http: add a test of actually pushing with httppostargs
Augie Fackler <augie@google.com>
parents:
31815
diff
changeset
|
366 > [experimental] |
970967e0a917
http: add a test of actually pushing with httppostargs
Augie Fackler <augie@google.com>
parents:
31815
diff
changeset
|
367 > httppostargs=true |
970967e0a917
http: add a test of actually pushing with httppostargs
Augie Fackler <augie@google.com>
parents:
31815
diff
changeset
|
368 > EOF |
970967e0a917
http: add a test of actually pushing with httppostargs
Augie Fackler <augie@google.com>
parents:
31815
diff
changeset
|
369 $ req |
970967e0a917
http: add a test of actually pushing with httppostargs
Augie Fackler <augie@google.com>
parents:
31815
diff
changeset
|
370 pushing to http://localhost:$HGPORT/ |
970967e0a917
http: add a test of actually pushing with httppostargs
Augie Fackler <augie@google.com>
parents:
31815
diff
changeset
|
371 searching for changes |
970967e0a917
http: add a test of actually pushing with httppostargs
Augie Fackler <augie@google.com>
parents:
31815
diff
changeset
|
372 remote: adding changesets |
970967e0a917
http: add a test of actually pushing with httppostargs
Augie Fackler <augie@google.com>
parents:
31815
diff
changeset
|
373 remote: adding manifests |
970967e0a917
http: add a test of actually pushing with httppostargs
Augie Fackler <augie@google.com>
parents:
31815
diff
changeset
|
374 remote: adding file changes |
970967e0a917
http: add a test of actually pushing with httppostargs
Augie Fackler <augie@google.com>
parents:
31815
diff
changeset
|
375 remote: added 1 changesets with 1 changes to 1 files |
970967e0a917
http: add a test of actually pushing with httppostargs
Augie Fackler <augie@google.com>
parents:
31815
diff
changeset
|
376 % serve errors |
970967e0a917
http: add a test of actually pushing with httppostargs
Augie Fackler <augie@google.com>
parents:
31815
diff
changeset
|
377 |
36242
477280637646
tests: consolidate test-push-http.t and test-push-http-bundle1.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36241
diff
changeset
|
378 #endif |
477280637646
tests: consolidate test-push-http.t and test-push-http-bundle1.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36241
diff
changeset
|
379 |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15933
diff
changeset
|
380 $ cd .. |
37818
877185de62cf
hgweb: reuse body file object when hgwebdir calls hgweb (issue5851)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37592
diff
changeset
|
381 |
877185de62cf
hgweb: reuse body file object when hgwebdir calls hgweb (issue5851)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37592
diff
changeset
|
382 Pushing via hgwebdir works |
877185de62cf
hgweb: reuse body file object when hgwebdir calls hgweb (issue5851)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37592
diff
changeset
|
383 |
877185de62cf
hgweb: reuse body file object when hgwebdir calls hgweb (issue5851)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37592
diff
changeset
|
384 $ hg init hgwebdir |
877185de62cf
hgweb: reuse body file object when hgwebdir calls hgweb (issue5851)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37592
diff
changeset
|
385 $ cd hgwebdir |
877185de62cf
hgweb: reuse body file object when hgwebdir calls hgweb (issue5851)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37592
diff
changeset
|
386 $ echo 0 > a |
877185de62cf
hgweb: reuse body file object when hgwebdir calls hgweb (issue5851)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37592
diff
changeset
|
387 $ hg -q commit -A -m initial |
877185de62cf
hgweb: reuse body file object when hgwebdir calls hgweb (issue5851)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37592
diff
changeset
|
388 $ cd .. |
877185de62cf
hgweb: reuse body file object when hgwebdir calls hgweb (issue5851)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37592
diff
changeset
|
389 |
877185de62cf
hgweb: reuse body file object when hgwebdir calls hgweb (issue5851)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37592
diff
changeset
|
390 $ cat > web.conf << EOF |
877185de62cf
hgweb: reuse body file object when hgwebdir calls hgweb (issue5851)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37592
diff
changeset
|
391 > [paths] |
877185de62cf
hgweb: reuse body file object when hgwebdir calls hgweb (issue5851)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37592
diff
changeset
|
392 > / = * |
877185de62cf
hgweb: reuse body file object when hgwebdir calls hgweb (issue5851)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37592
diff
changeset
|
393 > [web] |
877185de62cf
hgweb: reuse body file object when hgwebdir calls hgweb (issue5851)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37592
diff
changeset
|
394 > push_ssl = false |
877185de62cf
hgweb: reuse body file object when hgwebdir calls hgweb (issue5851)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37592
diff
changeset
|
395 > allow_push = * |
877185de62cf
hgweb: reuse body file object when hgwebdir calls hgweb (issue5851)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37592
diff
changeset
|
396 > EOF |
877185de62cf
hgweb: reuse body file object when hgwebdir calls hgweb (issue5851)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37592
diff
changeset
|
397 |
877185de62cf
hgweb: reuse body file object when hgwebdir calls hgweb (issue5851)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37592
diff
changeset
|
398 $ hg serve --web-conf web.conf -p $HGPORT -d --pid-file hg.pid |
37824
2968ad548583
test-push-http: do not clear pid file
Yuya Nishihara <yuya@tcha.org>
parents:
37818
diff
changeset
|
399 $ cat hg.pid >> $DAEMON_PIDS |
37818
877185de62cf
hgweb: reuse body file object when hgwebdir calls hgweb (issue5851)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37592
diff
changeset
|
400 |
877185de62cf
hgweb: reuse body file object when hgwebdir calls hgweb (issue5851)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37592
diff
changeset
|
401 $ hg clone http://localhost:$HGPORT/hgwebdir hgwebdir-local |
877185de62cf
hgweb: reuse body file object when hgwebdir calls hgweb (issue5851)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37592
diff
changeset
|
402 requesting all changes |
877185de62cf
hgweb: reuse body file object when hgwebdir calls hgweb (issue5851)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37592
diff
changeset
|
403 adding changesets |
877185de62cf
hgweb: reuse body file object when hgwebdir calls hgweb (issue5851)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37592
diff
changeset
|
404 adding manifests |
877185de62cf
hgweb: reuse body file object when hgwebdir calls hgweb (issue5851)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37592
diff
changeset
|
405 adding file changes |
877185de62cf
hgweb: reuse body file object when hgwebdir calls hgweb (issue5851)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37592
diff
changeset
|
406 added 1 changesets with 1 changes to 1 files |
877185de62cf
hgweb: reuse body file object when hgwebdir calls hgweb (issue5851)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37592
diff
changeset
|
407 new changesets 98a3f8f02ba7 |
877185de62cf
hgweb: reuse body file object when hgwebdir calls hgweb (issue5851)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37592
diff
changeset
|
408 updating to branch default |
877185de62cf
hgweb: reuse body file object when hgwebdir calls hgweb (issue5851)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37592
diff
changeset
|
409 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
877185de62cf
hgweb: reuse body file object when hgwebdir calls hgweb (issue5851)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37592
diff
changeset
|
410 $ cd hgwebdir-local |
877185de62cf
hgweb: reuse body file object when hgwebdir calls hgweb (issue5851)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37592
diff
changeset
|
411 $ echo commit > a |
877185de62cf
hgweb: reuse body file object when hgwebdir calls hgweb (issue5851)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37592
diff
changeset
|
412 $ hg commit -m 'local commit' |
877185de62cf
hgweb: reuse body file object when hgwebdir calls hgweb (issue5851)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37592
diff
changeset
|
413 |
877185de62cf
hgweb: reuse body file object when hgwebdir calls hgweb (issue5851)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37592
diff
changeset
|
414 $ hg push |
877185de62cf
hgweb: reuse body file object when hgwebdir calls hgweb (issue5851)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37592
diff
changeset
|
415 pushing to http://localhost:$HGPORT/hgwebdir |
877185de62cf
hgweb: reuse body file object when hgwebdir calls hgweb (issue5851)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37592
diff
changeset
|
416 searching for changes |
877185de62cf
hgweb: reuse body file object when hgwebdir calls hgweb (issue5851)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37592
diff
changeset
|
417 remote: adding changesets |
877185de62cf
hgweb: reuse body file object when hgwebdir calls hgweb (issue5851)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37592
diff
changeset
|
418 remote: adding manifests |
877185de62cf
hgweb: reuse body file object when hgwebdir calls hgweb (issue5851)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37592
diff
changeset
|
419 remote: adding file changes |
877185de62cf
hgweb: reuse body file object when hgwebdir calls hgweb (issue5851)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37592
diff
changeset
|
420 remote: added 1 changesets with 1 changes to 1 files |
877185de62cf
hgweb: reuse body file object when hgwebdir calls hgweb (issue5851)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37592
diff
changeset
|
421 |
877185de62cf
hgweb: reuse body file object when hgwebdir calls hgweb (issue5851)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37592
diff
changeset
|
422 $ killdaemons.py |
877185de62cf
hgweb: reuse body file object when hgwebdir calls hgweb (issue5851)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37592
diff
changeset
|
423 |
877185de62cf
hgweb: reuse body file object when hgwebdir calls hgweb (issue5851)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37592
diff
changeset
|
424 $ cd .. |