Mercurial > hg
annotate tests/test-ssh.t @ 38679:b3d0c97a0820
rebase: in --confirm option just abort if hit a conflict
Before this patch, it was prompting the user in both cases 1) when
there is no conflict 2) when there is at least one conflict. But
for simplicity we can just abort if we hit a conflict and no need to
prompt in that case.
Differential Revision: https://phab.mercurial-scm.org/D3944
author | Sushil khanchi <sushilkhanchi97@gmail.com> |
---|---|
date | Sat, 14 Jul 2018 08:59:42 +0530 |
parents | dfb888aae17a |
children | f1186c292d03 0ad5f064d829 |
rev | line source |
---|---|
36217
1ee1a42bfdae
tests: test using both versions of SSH protocol
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35792
diff
changeset
|
1 #testcases sshv1 sshv2 |
1ee1a42bfdae
tests: test using both versions of SSH protocol
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35792
diff
changeset
|
2 |
1ee1a42bfdae
tests: test using both versions of SSH protocol
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35792
diff
changeset
|
3 #if sshv2 |
1ee1a42bfdae
tests: test using both versions of SSH protocol
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35792
diff
changeset
|
4 $ cat >> $HGRCPATH << EOF |
1ee1a42bfdae
tests: test using both versions of SSH protocol
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35792
diff
changeset
|
5 > [experimental] |
1ee1a42bfdae
tests: test using both versions of SSH protocol
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35792
diff
changeset
|
6 > sshpeer.advertise-v2 = true |
1ee1a42bfdae
tests: test using both versions of SSH protocol
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35792
diff
changeset
|
7 > sshserver.support-v2 = true |
1ee1a42bfdae
tests: test using both versions of SSH protocol
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35792
diff
changeset
|
8 > EOF |
1ee1a42bfdae
tests: test using both versions of SSH protocol
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35792
diff
changeset
|
9 #endif |
4291
35b2e02367a5
test-ssh: use printenv.py
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3853
diff
changeset
|
10 |
12414 | 11 This test tries to exercise the ssh functionality with a dummy script |
1110 | 12 |
14185
eb297845f90b
tests: fix test-ssh.t after 6bd9778ae749
Mads Kiilerich <mads@kiilerich.com>
parents:
14164
diff
changeset
|
13 creating 'remote' repo |
4298
58517f6eb1ad
test-ssh: avoid a shell script
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4291
diff
changeset
|
14 |
12414 | 15 $ hg init remote |
16 $ cd remote | |
17 $ echo this > foo | |
18 $ echo this > fooO | |
19 $ hg ci -A -m "init" foo fooO | |
23126
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
20 |
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
21 insert a closed branch (issue4428) |
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
22 |
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
23 $ hg up null |
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
24 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
25 $ hg branch closed |
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
26 marked working directory as branch closed |
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
27 (branches are permanent and global, did you want a bookmark?) |
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
28 $ hg ci -mc0 |
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
29 $ hg ci --close-branch -mc1 |
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
30 $ hg up -q default |
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
31 |
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
32 configure for serving |
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
33 |
14185
eb297845f90b
tests: fix test-ssh.t after 6bd9778ae749
Mads Kiilerich <mads@kiilerich.com>
parents:
14164
diff
changeset
|
34 $ cat <<EOF > .hg/hgrc |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
35 > [server] |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
36 > uncompressed = True |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
37 > |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
38 > [hooks] |
30234
34a5f6c66bc5
tests: invoke printenv.py via sh -c for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
30155
diff
changeset
|
39 > changegroup = sh -c "printenv.py changegroup-in-remote 0 ../dummylog" |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
40 > EOF |
12414 | 41 $ cd .. |
1110 | 42 |
12414 | 43 repo not found error |
44 | |
33335
72f051f9a7d8
tests: quote $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
33286
diff
changeset
|
45 $ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" ssh://user@dummy/nonexistent local |
26142
7332bf4ae959
dispatch: error out on invalid -R path even if optionalrepo (issue4805) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
26141
diff
changeset
|
46 remote: abort: repository nonexistent not found! |
12414 | 47 abort: no suitable response from remote hg! |
48 [255] | |
49 | |
50 non-existent absolute path | |
1110 | 51 |
33335
72f051f9a7d8
tests: quote $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
33286
diff
changeset
|
52 $ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" ssh://user@dummy/`pwd`/nonexistent local |
26142
7332bf4ae959
dispatch: error out on invalid -R path even if optionalrepo (issue4805) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
26141
diff
changeset
|
53 remote: abort: repository $TESTTMP/nonexistent not found! |
12414 | 54 abort: no suitable response from remote hg! |
55 [255] | |
56 | |
57 clone remote via stream | |
1110 | 58 |
37349
36b2a304216c
tests: disable tests for advanced clone features with simple store
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37330
diff
changeset
|
59 #if no-reposimplestore |
36b2a304216c
tests: disable tests for advanced clone features with simple store
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37330
diff
changeset
|
60 |
34393
fffd3369aa83
commands: rename clone --uncompressed to --stream and document
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34322
diff
changeset
|
61 $ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" --stream ssh://user@dummy/remote local-stream |
12414 | 62 streaming all changes |
30155
b7a966ce89ed
changelog: disable delta chains
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29064
diff
changeset
|
63 4 files to transfer, 602 bytes of data |
b7a966ce89ed
changelog: disable delta chains
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29064
diff
changeset
|
64 transferred 602 bytes in * seconds (*) (glob) |
23116
2dc6b7917cdf
clone: fix copying bookmarks in uncompressed clones (issue4430)
Durham Goode <durham@fb.com>
parents:
22960
diff
changeset
|
65 searching for changes |
2dc6b7917cdf
clone: fix copying bookmarks in uncompressed clones (issue4430)
Durham Goode <durham@fb.com>
parents:
22960
diff
changeset
|
66 no changes found |
12414 | 67 updating to branch default |
12489 | 68 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
12414 | 69 $ cd local-stream |
70 $ hg verify | |
71 checking changesets | |
72 checking manifests | |
73 crosschecking files in changesets and manifests | |
74 checking files | |
23126
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
75 2 files, 3 changesets, 2 total revisions |
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
76 $ hg branches |
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
77 default 0:1160648e36ce |
12414 | 78 $ cd .. |
79 | |
23116
2dc6b7917cdf
clone: fix copying bookmarks in uncompressed clones (issue4430)
Durham Goode <durham@fb.com>
parents:
22960
diff
changeset
|
80 clone bookmarks via stream |
2dc6b7917cdf
clone: fix copying bookmarks in uncompressed clones (issue4430)
Durham Goode <durham@fb.com>
parents:
22960
diff
changeset
|
81 |
2dc6b7917cdf
clone: fix copying bookmarks in uncompressed clones (issue4430)
Durham Goode <durham@fb.com>
parents:
22960
diff
changeset
|
82 $ hg -R local-stream book mybook |
34393
fffd3369aa83
commands: rename clone --uncompressed to --stream and document
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34322
diff
changeset
|
83 $ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" --stream ssh://user@dummy/local-stream stream2 |
23116
2dc6b7917cdf
clone: fix copying bookmarks in uncompressed clones (issue4430)
Durham Goode <durham@fb.com>
parents:
22960
diff
changeset
|
84 streaming all changes |
30155
b7a966ce89ed
changelog: disable delta chains
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29064
diff
changeset
|
85 4 files to transfer, 602 bytes of data |
b7a966ce89ed
changelog: disable delta chains
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29064
diff
changeset
|
86 transferred 602 bytes in * seconds (*) (glob) |
23116
2dc6b7917cdf
clone: fix copying bookmarks in uncompressed clones (issue4430)
Durham Goode <durham@fb.com>
parents:
22960
diff
changeset
|
87 searching for changes |
2dc6b7917cdf
clone: fix copying bookmarks in uncompressed clones (issue4430)
Durham Goode <durham@fb.com>
parents:
22960
diff
changeset
|
88 no changes found |
2dc6b7917cdf
clone: fix copying bookmarks in uncompressed clones (issue4430)
Durham Goode <durham@fb.com>
parents:
22960
diff
changeset
|
89 updating to branch default |
2dc6b7917cdf
clone: fix copying bookmarks in uncompressed clones (issue4430)
Durham Goode <durham@fb.com>
parents:
22960
diff
changeset
|
90 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
2dc6b7917cdf
clone: fix copying bookmarks in uncompressed clones (issue4430)
Durham Goode <durham@fb.com>
parents:
22960
diff
changeset
|
91 $ cd stream2 |
2dc6b7917cdf
clone: fix copying bookmarks in uncompressed clones (issue4430)
Durham Goode <durham@fb.com>
parents:
22960
diff
changeset
|
92 $ hg book |
2dc6b7917cdf
clone: fix copying bookmarks in uncompressed clones (issue4430)
Durham Goode <durham@fb.com>
parents:
22960
diff
changeset
|
93 mybook 0:1160648e36ce |
2dc6b7917cdf
clone: fix copying bookmarks in uncompressed clones (issue4430)
Durham Goode <durham@fb.com>
parents:
22960
diff
changeset
|
94 $ cd .. |
2dc6b7917cdf
clone: fix copying bookmarks in uncompressed clones (issue4430)
Durham Goode <durham@fb.com>
parents:
22960
diff
changeset
|
95 $ rm -rf local-stream stream2 |
2dc6b7917cdf
clone: fix copying bookmarks in uncompressed clones (issue4430)
Durham Goode <durham@fb.com>
parents:
22960
diff
changeset
|
96 |
37349
36b2a304216c
tests: disable tests for advanced clone features with simple store
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37330
diff
changeset
|
97 #endif |
36b2a304216c
tests: disable tests for advanced clone features with simple store
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37330
diff
changeset
|
98 |
12414 | 99 clone remote via pull |
5978
7939c71f3132
sshrepo: be more careful while reading data
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4298
diff
changeset
|
100 |
33335
72f051f9a7d8
tests: quote $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
33286
diff
changeset
|
101 $ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote local |
12414 | 102 requesting all changes |
103 adding changesets | |
104 adding manifests | |
105 adding file changes | |
23126
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
106 added 3 changesets with 2 changes to 2 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34393
diff
changeset
|
107 new changesets 1160648e36ce:ad076bfb429d |
12414 | 108 updating to branch default |
109 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
110 | |
111 verify | |
1110 | 112 |
12414 | 113 $ cd local |
114 $ hg verify | |
115 checking changesets | |
116 checking manifests | |
117 crosschecking files in changesets and manifests | |
118 checking files | |
23126
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
119 2 files, 3 changesets, 2 total revisions |
30234
34a5f6c66bc5
tests: invoke printenv.py via sh -c for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
30155
diff
changeset
|
120 $ cat >> .hg/hgrc <<EOF |
34a5f6c66bc5
tests: invoke printenv.py via sh -c for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
30155
diff
changeset
|
121 > [hooks] |
34a5f6c66bc5
tests: invoke printenv.py via sh -c for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
30155
diff
changeset
|
122 > changegroup = sh -c "printenv.py changegroup-in-local 0 ../dummylog" |
34a5f6c66bc5
tests: invoke printenv.py via sh -c for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
30155
diff
changeset
|
123 > EOF |
1110 | 124 |
12414 | 125 empty default pull |
3275
7ae37d99d47e
ssh: make the error message more clear, add a testcase
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3095
diff
changeset
|
126 |
12414 | 127 $ hg paths |
128 default = ssh://user@dummy/remote | |
33335
72f051f9a7d8
tests: quote $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
33286
diff
changeset
|
129 $ hg pull -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" |
12414 | 130 pulling from ssh://user@dummy/remote |
131 searching for changes | |
132 no changes found | |
133 | |
24138
eabe44ec5af5
pull: print "pulling from foo" before accessing the other repo
Thomas Arendsen Hein <thomas@intevation.de>
parents:
23416
diff
changeset
|
134 pull from wrong ssh URL |
eabe44ec5af5
pull: print "pulling from foo" before accessing the other repo
Thomas Arendsen Hein <thomas@intevation.de>
parents:
23416
diff
changeset
|
135 |
33335
72f051f9a7d8
tests: quote $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
33286
diff
changeset
|
136 $ hg pull -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" ssh://user@dummy/doesnotexist |
24138
eabe44ec5af5
pull: print "pulling from foo" before accessing the other repo
Thomas Arendsen Hein <thomas@intevation.de>
parents:
23416
diff
changeset
|
137 pulling from ssh://user@dummy/doesnotexist |
26142
7332bf4ae959
dispatch: error out on invalid -R path even if optionalrepo (issue4805) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
26141
diff
changeset
|
138 remote: abort: repository doesnotexist not found! |
24138
eabe44ec5af5
pull: print "pulling from foo" before accessing the other repo
Thomas Arendsen Hein <thomas@intevation.de>
parents:
23416
diff
changeset
|
139 abort: no suitable response from remote hg! |
eabe44ec5af5
pull: print "pulling from foo" before accessing the other repo
Thomas Arendsen Hein <thomas@intevation.de>
parents:
23416
diff
changeset
|
140 [255] |
eabe44ec5af5
pull: print "pulling from foo" before accessing the other repo
Thomas Arendsen Hein <thomas@intevation.de>
parents:
23416
diff
changeset
|
141 |
12414 | 142 local change |
12409
0eaf7d32a5d8
test-ssh: test absolute paths in SSH URLs
Brodie Rao <brodie@bitheap.org>
parents:
12156
diff
changeset
|
143 |
12414 | 144 $ echo bleah > foo |
145 $ hg ci -m "add" | |
146 | |
147 updating rc | |
148 | |
149 $ echo "default-push = ssh://user@dummy/remote" >> .hg/hgrc | |
150 $ echo "[ui]" >> .hg/hgrc | |
33335
72f051f9a7d8
tests: quote $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
33286
diff
changeset
|
151 $ echo "ssh = \"$PYTHON\" \"$TESTDIR/dummyssh\"" >> .hg/hgrc |
12414 | 152 |
153 find outgoing | |
2612
ffb895f16925
add support for streaming clone.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2439
diff
changeset
|
154 |
12414 | 155 $ hg out ssh://user@dummy/remote |
156 comparing with ssh://user@dummy/remote | |
157 searching for changes | |
23126
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
158 changeset: 3:a28a9d1a809c |
12414 | 159 tag: tip |
23126
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
160 parent: 0:1160648e36ce |
12414 | 161 user: test |
162 date: Thu Jan 01 00:00:00 1970 +0000 | |
163 summary: add | |
164 | |
1110 | 165 |
12414 | 166 find incoming on the remote side |
1110 | 167 |
33335
72f051f9a7d8
tests: quote $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
33286
diff
changeset
|
168 $ hg incoming -R ../remote -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" ssh://user@dummy/local |
12414 | 169 comparing with ssh://user@dummy/local |
170 searching for changes | |
23126
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
171 changeset: 3:a28a9d1a809c |
12414 | 172 tag: tip |
23126
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
173 parent: 0:1160648e36ce |
12414 | 174 user: test |
175 date: Thu Jan 01 00:00:00 1970 +0000 | |
176 summary: add | |
177 | |
1110 | 178 |
12504
f7dd8bffe18c
test-ssh: test absolute path that exists
Brodie Rao <brodie@bitheap.org>
parents:
12489
diff
changeset
|
179 find incoming on the remote side (using absolute path) |
f7dd8bffe18c
test-ssh: test absolute path that exists
Brodie Rao <brodie@bitheap.org>
parents:
12489
diff
changeset
|
180 |
33335
72f051f9a7d8
tests: quote $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
33286
diff
changeset
|
181 $ hg incoming -R ../remote -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" "ssh://user@dummy/`pwd`" |
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12587
diff
changeset
|
182 comparing with ssh://user@dummy/$TESTTMP/local |
12504
f7dd8bffe18c
test-ssh: test absolute path that exists
Brodie Rao <brodie@bitheap.org>
parents:
12489
diff
changeset
|
183 searching for changes |
23126
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
184 changeset: 3:a28a9d1a809c |
12504
f7dd8bffe18c
test-ssh: test absolute path that exists
Brodie Rao <brodie@bitheap.org>
parents:
12489
diff
changeset
|
185 tag: tip |
23126
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
186 parent: 0:1160648e36ce |
12504
f7dd8bffe18c
test-ssh: test absolute path that exists
Brodie Rao <brodie@bitheap.org>
parents:
12489
diff
changeset
|
187 user: test |
f7dd8bffe18c
test-ssh: test absolute path that exists
Brodie Rao <brodie@bitheap.org>
parents:
12489
diff
changeset
|
188 date: Thu Jan 01 00:00:00 1970 +0000 |
f7dd8bffe18c
test-ssh: test absolute path that exists
Brodie Rao <brodie@bitheap.org>
parents:
12489
diff
changeset
|
189 summary: add |
f7dd8bffe18c
test-ssh: test absolute path that exists
Brodie Rao <brodie@bitheap.org>
parents:
12489
diff
changeset
|
190 |
f7dd8bffe18c
test-ssh: test absolute path that exists
Brodie Rao <brodie@bitheap.org>
parents:
12489
diff
changeset
|
191 |
12414 | 192 push |
1110 | 193 |
12414 | 194 $ hg push |
195 pushing to ssh://user@dummy/remote | |
196 searching for changes | |
197 remote: adding changesets | |
198 remote: adding manifests | |
199 remote: adding file changes | |
200 remote: added 1 changesets with 1 changes to 1 files | |
201 $ cd ../remote | |
202 | |
203 check remote tip | |
1110 | 204 |
12414 | 205 $ hg tip |
23126
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
206 changeset: 3:a28a9d1a809c |
12414 | 207 tag: tip |
23126
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
208 parent: 0:1160648e36ce |
12414 | 209 user: test |
210 date: Thu Jan 01 00:00:00 1970 +0000 | |
211 summary: add | |
212 | |
213 $ hg verify | |
214 checking changesets | |
215 checking manifests | |
216 crosschecking files in changesets and manifests | |
217 checking files | |
23126
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
218 2 files, 4 changesets, 3 total revisions |
12414 | 219 $ hg cat -r tip foo |
220 bleah | |
221 $ echo z > z | |
222 $ hg ci -A -m z z | |
223 created new head | |
1982
70ba0c86da8b
Added test for incoming via ssh.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1933
diff
changeset
|
224 |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
225 test pushkeys and bookmarks |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
226 |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
227 $ cd ../local |
33335
72f051f9a7d8
tests: quote $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
33286
diff
changeset
|
228 $ hg debugpushkey --config ui.ssh="\"$PYTHON\" \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote namespaces |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
229 bookmarks |
18255
7ca534f31a83
debugpushkey: list keys sorted
Mads Kiilerich <mads at kiilerich.com>
parents:
17844
diff
changeset
|
230 namespaces |
15648
79cc89de5be1
phases: add basic pushkey support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15622
diff
changeset
|
231 phases |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
232 $ hg book foo -r 0 |
38170
dfb888aae17a
outgoing: pay attention to `default:pushurl` for bookmarks and subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
38108
diff
changeset
|
233 $ hg out -B --config paths.default=bogus://invalid --config paths.default:pushurl=`hg paths default` |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
234 comparing with ssh://user@dummy/remote |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
235 searching for changed bookmarks |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
236 foo 1160648e36ce |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
237 $ hg push -B foo |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
238 pushing to ssh://user@dummy/remote |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
239 searching for changes |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
240 no changes found |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
241 exporting bookmark foo |
16038
dad96e752079
push: don't treat bookmark as a found change
Matt Mackall <mpm@selenic.com>
parents:
16023
diff
changeset
|
242 [1] |
33335
72f051f9a7d8
tests: quote $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
33286
diff
changeset
|
243 $ hg debugpushkey --config ui.ssh="\"$PYTHON\" \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote bookmarks |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
244 foo 1160648e36cec0054048a7edc4110c6f84fde594 |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
245 $ hg book -f foo |
13050 | 246 $ hg push --traceback |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
247 pushing to ssh://user@dummy/remote |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
248 searching for changes |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
249 no changes found |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
250 updating bookmark foo |
16023
90f8b8dd0326
push: return 1 if no changes found (issue3228)
Matt Mackall <mpm@selenic.com>
parents:
15897
diff
changeset
|
251 [1] |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
252 $ hg book -d foo |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
253 $ hg in -B |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
254 comparing with ssh://user@dummy/remote |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
255 searching for changed bookmarks |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
256 foo a28a9d1a809c |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
257 $ hg book -f -r 0 foo |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
258 $ hg pull -B foo |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
259 pulling from ssh://user@dummy/remote |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
260 no changes found |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
261 updating bookmark foo |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
262 $ hg book -d foo |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
263 $ hg push -B foo |
13368
d4ab9486e514
bookmarks: move push/pull command features to core
Matt Mackall <mpm@selenic.com>
parents:
13050
diff
changeset
|
264 pushing to ssh://user@dummy/remote |
d4ab9486e514
bookmarks: move push/pull command features to core
Matt Mackall <mpm@selenic.com>
parents:
13050
diff
changeset
|
265 searching for changes |
d4ab9486e514
bookmarks: move push/pull command features to core
Matt Mackall <mpm@selenic.com>
parents:
13050
diff
changeset
|
266 no changes found |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
267 deleting remote bookmark foo |
16038
dad96e752079
push: don't treat bookmark as a found change
Matt Mackall <mpm@selenic.com>
parents:
16023
diff
changeset
|
268 [1] |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
269 |
12414 | 270 a bad, evil hook that prints to stdout |
1110 | 271 |
14186
8513bd2e7259
tests: share dummyssh
Mads Kiilerich <mads@kiilerich.com>
parents:
14185
diff
changeset
|
272 $ cat <<EOF > $TESTTMP/badhook |
8513bd2e7259
tests: share dummyssh
Mads Kiilerich <mads@kiilerich.com>
parents:
14185
diff
changeset
|
273 > import sys |
8513bd2e7259
tests: share dummyssh
Mads Kiilerich <mads@kiilerich.com>
parents:
14185
diff
changeset
|
274 > sys.stdout.write("KABOOM\n") |
37943
45a669bad421
test-ssh: add some flush() to make output deterministic
Yuya Nishihara <yuya@tcha.org>
parents:
37813
diff
changeset
|
275 > sys.stdout.flush() |
14186
8513bd2e7259
tests: share dummyssh
Mads Kiilerich <mads@kiilerich.com>
parents:
14185
diff
changeset
|
276 > EOF |
8513bd2e7259
tests: share dummyssh
Mads Kiilerich <mads@kiilerich.com>
parents:
14185
diff
changeset
|
277 |
30364
ad56204f733e
hook: flush stdout before restoring stderr redirection
Yuya Nishihara <yuya@tcha.org>
parents:
30234
diff
changeset
|
278 $ cat <<EOF > $TESTTMP/badpyhook.py |
ad56204f733e
hook: flush stdout before restoring stderr redirection
Yuya Nishihara <yuya@tcha.org>
parents:
30234
diff
changeset
|
279 > import sys |
ad56204f733e
hook: flush stdout before restoring stderr redirection
Yuya Nishihara <yuya@tcha.org>
parents:
30234
diff
changeset
|
280 > def hook(ui, repo, hooktype, **kwargs): |
ad56204f733e
hook: flush stdout before restoring stderr redirection
Yuya Nishihara <yuya@tcha.org>
parents:
30234
diff
changeset
|
281 > sys.stdout.write("KABOOM IN PROCESS\n") |
37943
45a669bad421
test-ssh: add some flush() to make output deterministic
Yuya Nishihara <yuya@tcha.org>
parents:
37813
diff
changeset
|
282 > sys.stdout.flush() |
30364
ad56204f733e
hook: flush stdout before restoring stderr redirection
Yuya Nishihara <yuya@tcha.org>
parents:
30234
diff
changeset
|
283 > EOF |
ad56204f733e
hook: flush stdout before restoring stderr redirection
Yuya Nishihara <yuya@tcha.org>
parents:
30234
diff
changeset
|
284 |
ad56204f733e
hook: flush stdout before restoring stderr redirection
Yuya Nishihara <yuya@tcha.org>
parents:
30234
diff
changeset
|
285 $ cat <<EOF >> ../remote/.hg/hgrc |
ad56204f733e
hook: flush stdout before restoring stderr redirection
Yuya Nishihara <yuya@tcha.org>
parents:
30234
diff
changeset
|
286 > [hooks] |
33262
8e6f4939a69a
tests: replace yet more calls to `python` with $PYTHON
Augie Fackler <augie@google.com>
parents:
32054
diff
changeset
|
287 > changegroup.stdout = $PYTHON $TESTTMP/badhook |
30364
ad56204f733e
hook: flush stdout before restoring stderr redirection
Yuya Nishihara <yuya@tcha.org>
parents:
30234
diff
changeset
|
288 > changegroup.pystdout = python:$TESTTMP/badpyhook.py:hook |
ad56204f733e
hook: flush stdout before restoring stderr redirection
Yuya Nishihara <yuya@tcha.org>
parents:
30234
diff
changeset
|
289 > EOF |
12414 | 290 $ echo r > r |
291 $ hg ci -A -m z r | |
292 | |
293 push should succeed even though it has an unexpected response | |
1110 | 294 |
12414 | 295 $ hg push |
296 pushing to ssh://user@dummy/remote | |
297 searching for changes | |
20501
8a9e0b523d2d
discovery: improve "note: unsynced remote changes!" warning
Mads Kiilerich <madski@unity3d.com>
parents:
20403
diff
changeset
|
298 remote has heads on branch 'default' that are not known locally: 6c0482d977a3 |
12414 | 299 remote: adding changesets |
300 remote: adding manifests | |
301 remote: adding file changes | |
302 remote: added 1 changesets with 1 changes to 1 files | |
303 remote: KABOOM | |
30364
ad56204f733e
hook: flush stdout before restoring stderr redirection
Yuya Nishihara <yuya@tcha.org>
parents:
30234
diff
changeset
|
304 remote: KABOOM IN PROCESS |
12414 | 305 $ hg -R ../remote heads |
23126
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
306 changeset: 5:1383141674ec |
12414 | 307 tag: tip |
23126
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
308 parent: 3:a28a9d1a809c |
12414 | 309 user: test |
310 date: Thu Jan 01 00:00:00 1970 +0000 | |
311 summary: z | |
312 | |
23126
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
313 changeset: 4:6c0482d977a3 |
12414 | 314 parent: 0:1160648e36ce |
315 user: test | |
316 date: Thu Jan 01 00:00:00 1970 +0000 | |
317 summary: z | |
318 | |
13464
da0ddd62b9d8
sshrepo: catch passwords in ssh urls
Adrian Buehlmann <adrian@cadifra.com>
parents:
13405
diff
changeset
|
319 |
13604
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
320 clone bookmarks |
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
321 |
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
322 $ hg -R ../remote bookmark test |
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
323 $ hg -R ../remote bookmarks |
23126
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
324 * test 4:6c0482d977a3 |
33335
72f051f9a7d8
tests: quote $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
33286
diff
changeset
|
325 $ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote local-bookmarks |
13604
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
326 requesting all changes |
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
327 adding changesets |
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
328 adding manifests |
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
329 adding file changes |
23126
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
330 added 6 changesets with 5 changes to 4 files (+1 heads) |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34393
diff
changeset
|
331 new changesets 1160648e36ce:1383141674ec |
13604
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
332 updating to branch default |
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
333 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
334 $ hg -R local-bookmarks bookmarks |
23126
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
335 test 4:6c0482d977a3 |
13604
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
336 |
13464
da0ddd62b9d8
sshrepo: catch passwords in ssh urls
Adrian Buehlmann <adrian@cadifra.com>
parents:
13405
diff
changeset
|
337 passwords in ssh urls are not supported |
13755 | 338 (we use a glob here because different Python versions give different |
339 results here) | |
13464
da0ddd62b9d8
sshrepo: catch passwords in ssh urls
Adrian Buehlmann <adrian@cadifra.com>
parents:
13405
diff
changeset
|
340 |
da0ddd62b9d8
sshrepo: catch passwords in ssh urls
Adrian Buehlmann <adrian@cadifra.com>
parents:
13405
diff
changeset
|
341 $ hg push ssh://user:erroneouspwd@dummy/remote |
13755 | 342 pushing to ssh://user:*@dummy/remote (glob) |
13464
da0ddd62b9d8
sshrepo: catch passwords in ssh urls
Adrian Buehlmann <adrian@cadifra.com>
parents:
13405
diff
changeset
|
343 abort: password in URL not supported! |
da0ddd62b9d8
sshrepo: catch passwords in ssh urls
Adrian Buehlmann <adrian@cadifra.com>
parents:
13405
diff
changeset
|
344 [255] |
da0ddd62b9d8
sshrepo: catch passwords in ssh urls
Adrian Buehlmann <adrian@cadifra.com>
parents:
13405
diff
changeset
|
345 |
12414 | 346 $ cd .. |
15581
d8fa35c28335
ssh: quote remote paths (issue2983)
Mads Kiilerich <mads@kiilerich.com>
parents:
14186
diff
changeset
|
347 |
17015
73d20de5f30b
tests: add missing no-outer-repo requirements
Mads Kiilerich <mads@kiilerich.com>
parents:
16982
diff
changeset
|
348 hide outer repo |
73d20de5f30b
tests: add missing no-outer-repo requirements
Mads Kiilerich <mads@kiilerich.com>
parents:
16982
diff
changeset
|
349 $ hg init |
73d20de5f30b
tests: add missing no-outer-repo requirements
Mads Kiilerich <mads@kiilerich.com>
parents:
16982
diff
changeset
|
350 |
15581
d8fa35c28335
ssh: quote remote paths (issue2983)
Mads Kiilerich <mads@kiilerich.com>
parents:
14186
diff
changeset
|
351 Test remote paths with spaces (issue2983): |
d8fa35c28335
ssh: quote remote paths (issue2983)
Mads Kiilerich <mads@kiilerich.com>
parents:
14186
diff
changeset
|
352 |
33335
72f051f9a7d8
tests: quote $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
33286
diff
changeset
|
353 $ hg init --ssh "\"$PYTHON\" \"$TESTDIR/dummyssh\"" "ssh://user@dummy/a repo" |
17260
e432fb4b4221
tag: don't allow tagging the null revision (issue1915)
Brad Hall <bhall@fb.com>
parents:
17075
diff
changeset
|
354 $ touch "$TESTTMP/a repo/test" |
e432fb4b4221
tag: don't allow tagging the null revision (issue1915)
Brad Hall <bhall@fb.com>
parents:
17075
diff
changeset
|
355 $ hg -R 'a repo' commit -A -m "test" |
e432fb4b4221
tag: don't allow tagging the null revision (issue1915)
Brad Hall <bhall@fb.com>
parents:
17075
diff
changeset
|
356 adding test |
15581
d8fa35c28335
ssh: quote remote paths (issue2983)
Mads Kiilerich <mads@kiilerich.com>
parents:
14186
diff
changeset
|
357 $ hg -R 'a repo' tag tag |
33335
72f051f9a7d8
tests: quote $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
33286
diff
changeset
|
358 $ hg id --ssh "\"$PYTHON\" \"$TESTDIR/dummyssh\"" "ssh://user@dummy/a repo" |
17260
e432fb4b4221
tag: don't allow tagging the null revision (issue1915)
Brad Hall <bhall@fb.com>
parents:
17075
diff
changeset
|
359 73649e48688a |
15581
d8fa35c28335
ssh: quote remote paths (issue2983)
Mads Kiilerich <mads@kiilerich.com>
parents:
14186
diff
changeset
|
360 |
33335
72f051f9a7d8
tests: quote $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
33286
diff
changeset
|
361 $ hg id --ssh "\"$PYTHON\" \"$TESTDIR/dummyssh\"" "ssh://user@dummy/a repo#noNoNO" |
21188
d36440d84328
httppeer: reintroduce _abort that accidentally was removed in 167047ba3cfa
Mads Kiilerich <madski@unity3d.com>
parents:
20501
diff
changeset
|
362 abort: unknown revision 'noNoNO'! |
d36440d84328
httppeer: reintroduce _abort that accidentally was removed in 167047ba3cfa
Mads Kiilerich <madski@unity3d.com>
parents:
20501
diff
changeset
|
363 [255] |
d36440d84328
httppeer: reintroduce _abort that accidentally was removed in 167047ba3cfa
Mads Kiilerich <madski@unity3d.com>
parents:
20501
diff
changeset
|
364 |
17844
b32e55e6c3c7
clone: don't %-escape the default destination (issue3145)
Matt Mackall <mpm@selenic.com>
parents:
17298
diff
changeset
|
365 Test (non-)escaping of remote paths with spaces when cloning (issue3145): |
b32e55e6c3c7
clone: don't %-escape the default destination (issue3145)
Matt Mackall <mpm@selenic.com>
parents:
17298
diff
changeset
|
366 |
33335
72f051f9a7d8
tests: quote $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
33286
diff
changeset
|
367 $ hg clone --ssh "\"$PYTHON\" \"$TESTDIR/dummyssh\"" "ssh://user@dummy/a repo" |
17844
b32e55e6c3c7
clone: don't %-escape the default destination (issue3145)
Matt Mackall <mpm@selenic.com>
parents:
17298
diff
changeset
|
368 destination directory: a repo |
b32e55e6c3c7
clone: don't %-escape the default destination (issue3145)
Matt Mackall <mpm@selenic.com>
parents:
17298
diff
changeset
|
369 abort: destination 'a repo' is not empty |
b32e55e6c3c7
clone: don't %-escape the default destination (issue3145)
Matt Mackall <mpm@selenic.com>
parents:
17298
diff
changeset
|
370 [255] |
b32e55e6c3c7
clone: don't %-escape the default destination (issue3145)
Matt Mackall <mpm@selenic.com>
parents:
17298
diff
changeset
|
371 |
32050
77eaf9539499
dispatch: protect against malicious 'hg serve --stdio' invocations (sec)
Augie Fackler <augie@google.com>
parents:
30914
diff
changeset
|
372 Make sure hg is really paranoid in serve --stdio mode. It used to be |
77eaf9539499
dispatch: protect against malicious 'hg serve --stdio' invocations (sec)
Augie Fackler <augie@google.com>
parents:
30914
diff
changeset
|
373 possible to get a debugger REPL by specifying a repo named --debugger. |
77eaf9539499
dispatch: protect against malicious 'hg serve --stdio' invocations (sec)
Augie Fackler <augie@google.com>
parents:
30914
diff
changeset
|
374 $ hg -R --debugger serve --stdio |
77eaf9539499
dispatch: protect against malicious 'hg serve --stdio' invocations (sec)
Augie Fackler <augie@google.com>
parents:
30914
diff
changeset
|
375 abort: potentially unsafe serve --stdio invocation: ['-R', '--debugger', 'serve', '--stdio'] |
77eaf9539499
dispatch: protect against malicious 'hg serve --stdio' invocations (sec)
Augie Fackler <augie@google.com>
parents:
30914
diff
changeset
|
376 [255] |
77eaf9539499
dispatch: protect against malicious 'hg serve --stdio' invocations (sec)
Augie Fackler <augie@google.com>
parents:
30914
diff
changeset
|
377 $ hg -R --config=ui.debugger=yes serve --stdio |
77eaf9539499
dispatch: protect against malicious 'hg serve --stdio' invocations (sec)
Augie Fackler <augie@google.com>
parents:
30914
diff
changeset
|
378 abort: potentially unsafe serve --stdio invocation: ['-R', '--config=ui.debugger=yes', 'serve', '--stdio'] |
77eaf9539499
dispatch: protect against malicious 'hg serve --stdio' invocations (sec)
Augie Fackler <augie@google.com>
parents:
30914
diff
changeset
|
379 [255] |
77eaf9539499
dispatch: protect against malicious 'hg serve --stdio' invocations (sec)
Augie Fackler <augie@google.com>
parents:
30914
diff
changeset
|
380 Abbreviations of 'serve' also don't work, to avoid shenanigans. |
77eaf9539499
dispatch: protect against malicious 'hg serve --stdio' invocations (sec)
Augie Fackler <augie@google.com>
parents:
30914
diff
changeset
|
381 $ hg -R narf serv --stdio |
77eaf9539499
dispatch: protect against malicious 'hg serve --stdio' invocations (sec)
Augie Fackler <augie@google.com>
parents:
30914
diff
changeset
|
382 abort: potentially unsafe serve --stdio invocation: ['-R', 'narf', 'serv', '--stdio'] |
77eaf9539499
dispatch: protect against malicious 'hg serve --stdio' invocations (sec)
Augie Fackler <augie@google.com>
parents:
30914
diff
changeset
|
383 [255] |
77eaf9539499
dispatch: protect against malicious 'hg serve --stdio' invocations (sec)
Augie Fackler <augie@google.com>
parents:
30914
diff
changeset
|
384 |
16608
289fdcd4cb47
tests: improve test of hg-ssh and make the test pass on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
16606
diff
changeset
|
385 Test hg-ssh using a helper script that will restore PYTHONPATH (which might |
289fdcd4cb47
tests: improve test of hg-ssh and make the test pass on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
16606
diff
changeset
|
386 have been cleared by a hg.exe wrapper) and invoke hg-ssh with the right |
289fdcd4cb47
tests: improve test of hg-ssh and make the test pass on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
16606
diff
changeset
|
387 parameters: |
15897
cc021114fc98
hg-ssh: use shlex for shell-like parsing of SSH_ORIGINAL_COMMAND
Mads Kiilerich <mads@kiilerich.com>
parents:
15648
diff
changeset
|
388 |
16608
289fdcd4cb47
tests: improve test of hg-ssh and make the test pass on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
16606
diff
changeset
|
389 $ cat > ssh.sh << EOF |
289fdcd4cb47
tests: improve test of hg-ssh and make the test pass on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
16606
diff
changeset
|
390 > userhost="\$1" |
289fdcd4cb47
tests: improve test of hg-ssh and make the test pass on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
16606
diff
changeset
|
391 > SSH_ORIGINAL_COMMAND="\$2" |
289fdcd4cb47
tests: improve test of hg-ssh and make the test pass on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
16606
diff
changeset
|
392 > export SSH_ORIGINAL_COMMAND |
289fdcd4cb47
tests: improve test of hg-ssh and make the test pass on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
16606
diff
changeset
|
393 > PYTHONPATH="$PYTHONPATH" |
289fdcd4cb47
tests: improve test of hg-ssh and make the test pass on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
16606
diff
changeset
|
394 > export PYTHONPATH |
33335
72f051f9a7d8
tests: quote $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
33286
diff
changeset
|
395 > "$PYTHON" "$TESTDIR/../contrib/hg-ssh" "$TESTTMP/a repo" |
16608
289fdcd4cb47
tests: improve test of hg-ssh and make the test pass on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
16606
diff
changeset
|
396 > EOF |
289fdcd4cb47
tests: improve test of hg-ssh and make the test pass on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
16606
diff
changeset
|
397 |
289fdcd4cb47
tests: improve test of hg-ssh and make the test pass on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
16606
diff
changeset
|
398 $ hg id --ssh "sh ssh.sh" "ssh://user@dummy/a repo" |
17260
e432fb4b4221
tag: don't allow tagging the null revision (issue1915)
Brad Hall <bhall@fb.com>
parents:
17075
diff
changeset
|
399 73649e48688a |
16606
19379226dc67
hg-ssh: use %s for printing paths in error messages
Mads Kiilerich <mads@kiilerich.com>
parents:
16541
diff
changeset
|
400 |
16608
289fdcd4cb47
tests: improve test of hg-ssh and make the test pass on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
16606
diff
changeset
|
401 $ hg id --ssh "sh ssh.sh" "ssh://user@dummy/a'repo" |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35268
diff
changeset
|
402 remote: Illegal repository "$TESTTMP/a'repo" |
15897
cc021114fc98
hg-ssh: use shlex for shell-like parsing of SSH_ORIGINAL_COMMAND
Mads Kiilerich <mads@kiilerich.com>
parents:
15648
diff
changeset
|
403 abort: no suitable response from remote hg! |
cc021114fc98
hg-ssh: use shlex for shell-like parsing of SSH_ORIGINAL_COMMAND
Mads Kiilerich <mads@kiilerich.com>
parents:
15648
diff
changeset
|
404 [255] |
16606
19379226dc67
hg-ssh: use %s for printing paths in error messages
Mads Kiilerich <mads@kiilerich.com>
parents:
16541
diff
changeset
|
405 |
16608
289fdcd4cb47
tests: improve test of hg-ssh and make the test pass on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
16606
diff
changeset
|
406 $ hg id --ssh "sh ssh.sh" --remotecmd hacking "ssh://user@dummy/a'repo" |
289fdcd4cb47
tests: improve test of hg-ssh and make the test pass on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
16606
diff
changeset
|
407 remote: Illegal command "hacking -R 'a'\''repo' serve --stdio" |
15897
cc021114fc98
hg-ssh: use shlex for shell-like parsing of SSH_ORIGINAL_COMMAND
Mads Kiilerich <mads@kiilerich.com>
parents:
15648
diff
changeset
|
408 abort: no suitable response from remote hg! |
cc021114fc98
hg-ssh: use shlex for shell-like parsing of SSH_ORIGINAL_COMMAND
Mads Kiilerich <mads@kiilerich.com>
parents:
15648
diff
changeset
|
409 [255] |
cc021114fc98
hg-ssh: use shlex for shell-like parsing of SSH_ORIGINAL_COMMAND
Mads Kiilerich <mads@kiilerich.com>
parents:
15648
diff
changeset
|
410 |
33262
8e6f4939a69a
tests: replace yet more calls to `python` with $PYTHON
Augie Fackler <augie@google.com>
parents:
32054
diff
changeset
|
411 $ SSH_ORIGINAL_COMMAND="'hg' -R 'a'repo' serve --stdio" $PYTHON "$TESTDIR/../contrib/hg-ssh" |
16608
289fdcd4cb47
tests: improve test of hg-ssh and make the test pass on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
16606
diff
changeset
|
412 Illegal command "'hg' -R 'a'repo' serve --stdio": No closing quotation |
289fdcd4cb47
tests: improve test of hg-ssh and make the test pass on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
16606
diff
changeset
|
413 [255] |
289fdcd4cb47
tests: improve test of hg-ssh and make the test pass on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
16606
diff
changeset
|
414 |
16836
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16608
diff
changeset
|
415 Test hg-ssh in read-only mode: |
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16608
diff
changeset
|
416 |
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16608
diff
changeset
|
417 $ cat > ssh.sh << EOF |
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16608
diff
changeset
|
418 > userhost="\$1" |
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16608
diff
changeset
|
419 > SSH_ORIGINAL_COMMAND="\$2" |
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16608
diff
changeset
|
420 > export SSH_ORIGINAL_COMMAND |
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16608
diff
changeset
|
421 > PYTHONPATH="$PYTHONPATH" |
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16608
diff
changeset
|
422 > export PYTHONPATH |
33335
72f051f9a7d8
tests: quote $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
33286
diff
changeset
|
423 > "$PYTHON" "$TESTDIR/../contrib/hg-ssh" --read-only "$TESTTMP/remote" |
16836
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16608
diff
changeset
|
424 > EOF |
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16608
diff
changeset
|
425 |
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16608
diff
changeset
|
426 $ hg clone --ssh "sh ssh.sh" "ssh://user@dummy/$TESTTMP/remote" read-only-local |
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16608
diff
changeset
|
427 requesting all changes |
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16608
diff
changeset
|
428 adding changesets |
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16608
diff
changeset
|
429 adding manifests |
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16608
diff
changeset
|
430 adding file changes |
23126
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
431 added 6 changesets with 5 changes to 4 files (+1 heads) |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34393
diff
changeset
|
432 new changesets 1160648e36ce:1383141674ec |
16836
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16608
diff
changeset
|
433 updating to branch default |
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16608
diff
changeset
|
434 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16608
diff
changeset
|
435 |
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16608
diff
changeset
|
436 $ cd read-only-local |
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16608
diff
changeset
|
437 $ echo "baz" > bar |
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16608
diff
changeset
|
438 $ hg ci -A -m "unpushable commit" bar |
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16608
diff
changeset
|
439 $ hg push --ssh "sh ../ssh.sh" |
16897
2774576dee4d
tests/run-tests: avoid C:/ in arguments
Adrian Buehlmann <adrian@cadifra.com>
parents:
16836
diff
changeset
|
440 pushing to ssh://user@dummy/*/remote (glob) |
16836
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16608
diff
changeset
|
441 searching for changes |
25422
8dc5ee5b7b09
sshpeer: use the doublepipe object for the server to client channel
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25405
diff
changeset
|
442 remote: Permission denied |
26829
58f1645f72c3
bundle2: attribute remote failures to remote (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26828
diff
changeset
|
443 remote: pretxnopen.hg-ssh hook failed |
58f1645f72c3
bundle2: attribute remote failures to remote (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26828
diff
changeset
|
444 abort: push failed on remote |
25376
2c14ab597353
test: use bundle2 in test-ssh
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25367
diff
changeset
|
445 [255] |
16836
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16608
diff
changeset
|
446 |
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16608
diff
changeset
|
447 $ cd .. |
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16608
diff
changeset
|
448 |
22247
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
449 stderr from remote commands should be printed before stdout from local code (issue4336) |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
450 |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
451 $ hg clone remote stderr-ordering |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
452 updating to branch default |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
453 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
454 $ cd stderr-ordering |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
455 $ cat >> localwrite.py << EOF |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
456 > from mercurial import exchange, extensions |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
457 > |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
458 > def wrappedpush(orig, repo, *args, **kwargs): |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
459 > res = orig(repo, *args, **kwargs) |
38108
e69628f36196
py3: add b'' prefixes in tests/test-ssh.t and tests/test-ssh-bundle1.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37943
diff
changeset
|
460 > repo.ui.write(b'local stdout\n') |
37943
45a669bad421
test-ssh: add some flush() to make output deterministic
Yuya Nishihara <yuya@tcha.org>
parents:
37813
diff
changeset
|
461 > repo.ui.flush() |
22247
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
462 > return res |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
463 > |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
464 > def extsetup(ui): |
38108
e69628f36196
py3: add b'' prefixes in tests/test-ssh.t and tests/test-ssh-bundle1.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37943
diff
changeset
|
465 > extensions.wrapfunction(exchange, b'push', wrappedpush) |
22247
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
466 > EOF |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
467 |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
468 $ cat >> .hg/hgrc << EOF |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
469 > [paths] |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
470 > default-push = ssh://user@dummy/remote |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
471 > [ui] |
33335
72f051f9a7d8
tests: quote $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
33286
diff
changeset
|
472 > ssh = "$PYTHON" "$TESTDIR/dummyssh" |
22247
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
473 > [extensions] |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
474 > localwrite = localwrite.py |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
475 > EOF |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
476 |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
477 $ echo localwrite > foo |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
478 $ hg commit -m 'testing localwrite' |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
479 $ hg push |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
480 pushing to ssh://user@dummy/remote |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
481 searching for changes |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
482 remote: adding changesets |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
483 remote: adding manifests |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
484 remote: adding file changes |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
485 remote: added 1 changesets with 1 changes to 1 files |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
486 remote: KABOOM |
30364
ad56204f733e
hook: flush stdout before restoring stderr redirection
Yuya Nishihara <yuya@tcha.org>
parents:
30234
diff
changeset
|
487 remote: KABOOM IN PROCESS |
22247
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
488 local stdout |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
489 |
25338
405303df6a2a
ssh: test some no-op pull through ssh with --debug
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25127
diff
changeset
|
490 debug output |
405303df6a2a
ssh: test some no-op pull through ssh with --debug
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25127
diff
changeset
|
491 |
35699
f7ef49e44d7c
sshpeer: add support for request tracing
Boris Feld <boris.feld@octobus.net>
parents:
35484
diff
changeset
|
492 $ hg pull --debug ssh://user@dummy/remote --config devel.debug.peer-request=yes |
25338
405303df6a2a
ssh: test some no-op pull through ssh with --debug
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25127
diff
changeset
|
493 pulling from ssh://user@dummy/remote |
33659
8cb9e921ef8c
ssh: quote parameters using shellquote (SEC)
Jun Wu <quark@fb.com>
parents:
33335
diff
changeset
|
494 running .* ".*/dummyssh" ['"]user@dummy['"] ('|")hg -R remote serve --stdio('|") (re) |
36217
1ee1a42bfdae
tests: test using both versions of SSH protocol
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35792
diff
changeset
|
495 sending upgrade request: * proto=exp-ssh-v2-0001 (glob) (sshv2 !) |
37813
58bbd14b0c62
sshpeer: reflect actual command activity one handshake
Boris Feld <boris.feld@octobus.net>
parents:
37413
diff
changeset
|
496 devel-peer-request: hello+between |
58bbd14b0c62
sshpeer: reflect actual command activity one handshake
Boris Feld <boris.feld@octobus.net>
parents:
37413
diff
changeset
|
497 devel-peer-request: pairs: 81 bytes |
25338
405303df6a2a
ssh: test some no-op pull through ssh with --debug
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25127
diff
changeset
|
498 sending hello command |
405303df6a2a
ssh: test some no-op pull through ssh with --debug
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25127
diff
changeset
|
499 sending between command |
37393
afcfdf53e4b5
wireproto: provide accessors for client capabilities
Joerg Sonnenberger <joerg@bec.de>
parents:
37349
diff
changeset
|
500 remote: 413 (sshv1 !) |
36217
1ee1a42bfdae
tests: test using both versions of SSH protocol
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35792
diff
changeset
|
501 protocol upgraded to exp-ssh-v2-0001 (sshv2 !) |
37413
33af46d639b4
wireproto: send server capabilities in canonical order
Joerg Sonnenberger <joerg@bec.de>
parents:
37393
diff
changeset
|
502 remote: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash |
36217
1ee1a42bfdae
tests: test using both versions of SSH protocol
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35792
diff
changeset
|
503 remote: 1 (sshv1 !) |
37393
afcfdf53e4b5
wireproto: provide accessors for client capabilities
Joerg Sonnenberger <joerg@bec.de>
parents:
37349
diff
changeset
|
504 devel-peer-request: protocaps |
afcfdf53e4b5
wireproto: provide accessors for client capabilities
Joerg Sonnenberger <joerg@bec.de>
parents:
37349
diff
changeset
|
505 devel-peer-request: caps: * bytes (glob) |
afcfdf53e4b5
wireproto: provide accessors for client capabilities
Joerg Sonnenberger <joerg@bec.de>
parents:
37349
diff
changeset
|
506 sending protocaps command |
25338
405303df6a2a
ssh: test some no-op pull through ssh with --debug
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25127
diff
changeset
|
507 query 1; heads |
36945
4901d1e22b27
peer-request: include more details about batch commands
Boris Feld <boris.feld@octobus.net>
parents:
36612
diff
changeset
|
508 devel-peer-request: batched-content |
4901d1e22b27
peer-request: include more details about batch commands
Boris Feld <boris.feld@octobus.net>
parents:
36612
diff
changeset
|
509 devel-peer-request: - heads (0 arguments) |
4901d1e22b27
peer-request: include more details about batch commands
Boris Feld <boris.feld@octobus.net>
parents:
36612
diff
changeset
|
510 devel-peer-request: - known (1 arguments) |
35699
f7ef49e44d7c
sshpeer: add support for request tracing
Boris Feld <boris.feld@octobus.net>
parents:
35484
diff
changeset
|
511 devel-peer-request: batch |
f7ef49e44d7c
sshpeer: add support for request tracing
Boris Feld <boris.feld@octobus.net>
parents:
35484
diff
changeset
|
512 devel-peer-request: cmds: 141 bytes |
25338
405303df6a2a
ssh: test some no-op pull through ssh with --debug
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25127
diff
changeset
|
513 sending batch command |
405303df6a2a
ssh: test some no-op pull through ssh with --debug
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25127
diff
changeset
|
514 searching for changes |
405303df6a2a
ssh: test some no-op pull through ssh with --debug
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25127
diff
changeset
|
515 all remote heads known locally |
405303df6a2a
ssh: test some no-op pull through ssh with --debug
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25127
diff
changeset
|
516 no changes found |
35699
f7ef49e44d7c
sshpeer: add support for request tracing
Boris Feld <boris.feld@octobus.net>
parents:
35484
diff
changeset
|
517 devel-peer-request: getbundle |
f7ef49e44d7c
sshpeer: add support for request tracing
Boris Feld <boris.feld@octobus.net>
parents:
35484
diff
changeset
|
518 devel-peer-request: bookmarks: 1 bytes |
36968
2090044a288d
revbranchcache: advertise and use 'rbc' exchange capability
Boris Feld <boris.feld@octobus.net>
parents:
36945
diff
changeset
|
519 devel-peer-request: bundlecaps: 266 bytes |
35699
f7ef49e44d7c
sshpeer: add support for request tracing
Boris Feld <boris.feld@octobus.net>
parents:
35484
diff
changeset
|
520 devel-peer-request: cg: 1 bytes |
f7ef49e44d7c
sshpeer: add support for request tracing
Boris Feld <boris.feld@octobus.net>
parents:
35484
diff
changeset
|
521 devel-peer-request: common: 122 bytes |
f7ef49e44d7c
sshpeer: add support for request tracing
Boris Feld <boris.feld@octobus.net>
parents:
35484
diff
changeset
|
522 devel-peer-request: heads: 122 bytes |
f7ef49e44d7c
sshpeer: add support for request tracing
Boris Feld <boris.feld@octobus.net>
parents:
35484
diff
changeset
|
523 devel-peer-request: listkeys: 9 bytes |
f7ef49e44d7c
sshpeer: add support for request tracing
Boris Feld <boris.feld@octobus.net>
parents:
35484
diff
changeset
|
524 devel-peer-request: phases: 1 bytes |
25376
2c14ab597353
test: use bundle2 in test-ssh
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25367
diff
changeset
|
525 sending getbundle command |
2c14ab597353
test: use bundle2 in test-ssh
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25367
diff
changeset
|
526 bundle2-input-bundle: with-transaction |
35268
44b8b5ad30eb
pull: retrieve bookmarks through the binary part when possible
Boris Feld <boris.feld@octobus.net>
parents:
35259
diff
changeset
|
527 bundle2-input-part: "bookmarks" supported |
44b8b5ad30eb
pull: retrieve bookmarks through the binary part when possible
Boris Feld <boris.feld@octobus.net>
parents:
35259
diff
changeset
|
528 bundle2-input-part: total payload size 26 |
25376
2c14ab597353
test: use bundle2 in test-ssh
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25367
diff
changeset
|
529 bundle2-input-part: "listkeys" (params: 1 mandatory) supported |
2c14ab597353
test: use bundle2 in test-ssh
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25367
diff
changeset
|
530 bundle2-input-part: total payload size 45 |
34322
10e162bb9bf5
pull: use 'phase-heads' to retrieve phase information
Boris Feld <boris.feld@octobus.net>
parents:
33659
diff
changeset
|
531 bundle2-input-part: "phase-heads" supported |
10e162bb9bf5
pull: use 'phase-heads' to retrieve phase information
Boris Feld <boris.feld@octobus.net>
parents:
33659
diff
changeset
|
532 bundle2-input-part: total payload size 72 |
35268
44b8b5ad30eb
pull: retrieve bookmarks through the binary part when possible
Boris Feld <boris.feld@octobus.net>
parents:
35259
diff
changeset
|
533 bundle2-input-bundle: 2 parts total |
25376
2c14ab597353
test: use bundle2 in test-ssh
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25367
diff
changeset
|
534 checking for updated bookmarks |
25338
405303df6a2a
ssh: test some no-op pull through ssh with --debug
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25127
diff
changeset
|
535 |
22247
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
536 $ cd .. |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
537 |
12414 | 538 $ cat dummylog |
15622
86fc364ca5f8
sshrepo: don't quote obviously safe strings (issue2983)
Mads Kiilerich <mads@kiilerich.com>
parents:
15581
diff
changeset
|
539 Got arguments 1:user@dummy 2:hg -R nonexistent serve --stdio |
26141
fa6ba7c9600b
test-ssh: remove superfluous triple slashes from absolute path test
Yuya Nishihara <yuya@tcha.org>
parents:
25495
diff
changeset
|
540 Got arguments 1:user@dummy 2:hg -R $TESTTMP/nonexistent serve --stdio |
15622
86fc364ca5f8
sshrepo: don't quote obviously safe strings (issue2983)
Mads Kiilerich <mads@kiilerich.com>
parents:
15581
diff
changeset
|
541 Got arguments 1:user@dummy 2:hg -R remote serve --stdio |
37349
36b2a304216c
tests: disable tests for advanced clone features with simple store
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37330
diff
changeset
|
542 Got arguments 1:user@dummy 2:hg -R local-stream serve --stdio (no-reposimplestore !) |
36b2a304216c
tests: disable tests for advanced clone features with simple store
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37330
diff
changeset
|
543 Got arguments 1:user@dummy 2:hg -R remote serve --stdio (no-reposimplestore !) |
36b2a304216c
tests: disable tests for advanced clone features with simple store
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37330
diff
changeset
|
544 Got arguments 1:user@dummy 2:hg -R remote serve --stdio (no-reposimplestore !) |
24138
eabe44ec5af5
pull: print "pulling from foo" before accessing the other repo
Thomas Arendsen Hein <thomas@intevation.de>
parents:
23416
diff
changeset
|
545 Got arguments 1:user@dummy 2:hg -R doesnotexist serve --stdio |
15622
86fc364ca5f8
sshrepo: don't quote obviously safe strings (issue2983)
Mads Kiilerich <mads@kiilerich.com>
parents:
15581
diff
changeset
|
546 Got arguments 1:user@dummy 2:hg -R remote serve --stdio |
86fc364ca5f8
sshrepo: don't quote obviously safe strings (issue2983)
Mads Kiilerich <mads@kiilerich.com>
parents:
15581
diff
changeset
|
547 Got arguments 1:user@dummy 2:hg -R local serve --stdio |
86fc364ca5f8
sshrepo: don't quote obviously safe strings (issue2983)
Mads Kiilerich <mads@kiilerich.com>
parents:
15581
diff
changeset
|
548 Got arguments 1:user@dummy 2:hg -R $TESTTMP/local serve --stdio |
86fc364ca5f8
sshrepo: don't quote obviously safe strings (issue2983)
Mads Kiilerich <mads@kiilerich.com>
parents:
15581
diff
changeset
|
549 Got arguments 1:user@dummy 2:hg -R remote serve --stdio |
31747
aff7b32b3c05
hook: add hook name information to external hook
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
31746
diff
changeset
|
550 changegroup-in-remote hook: HG_BUNDLE2=1 HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=a28a9d1a809cab7d4e2fde4bee738a9ede948b60 HG_NODE_LAST=a28a9d1a809cab7d4e2fde4bee738a9ede948b60 HG_SOURCE=serve HG_TXNID=TXN:$ID$ HG_URL=remote:ssh:$LOCALIP |
15622
86fc364ca5f8
sshrepo: don't quote obviously safe strings (issue2983)
Mads Kiilerich <mads@kiilerich.com>
parents:
15581
diff
changeset
|
551 Got arguments 1:user@dummy 2:hg -R remote serve --stdio |
86fc364ca5f8
sshrepo: don't quote obviously safe strings (issue2983)
Mads Kiilerich <mads@kiilerich.com>
parents:
15581
diff
changeset
|
552 Got arguments 1:user@dummy 2:hg -R remote serve --stdio |
86fc364ca5f8
sshrepo: don't quote obviously safe strings (issue2983)
Mads Kiilerich <mads@kiilerich.com>
parents:
15581
diff
changeset
|
553 Got arguments 1:user@dummy 2:hg -R remote serve --stdio |
86fc364ca5f8
sshrepo: don't quote obviously safe strings (issue2983)
Mads Kiilerich <mads@kiilerich.com>
parents:
15581
diff
changeset
|
554 Got arguments 1:user@dummy 2:hg -R remote serve --stdio |
86fc364ca5f8
sshrepo: don't quote obviously safe strings (issue2983)
Mads Kiilerich <mads@kiilerich.com>
parents:
15581
diff
changeset
|
555 Got arguments 1:user@dummy 2:hg -R remote serve --stdio |
86fc364ca5f8
sshrepo: don't quote obviously safe strings (issue2983)
Mads Kiilerich <mads@kiilerich.com>
parents:
15581
diff
changeset
|
556 Got arguments 1:user@dummy 2:hg -R remote serve --stdio |
86fc364ca5f8
sshrepo: don't quote obviously safe strings (issue2983)
Mads Kiilerich <mads@kiilerich.com>
parents:
15581
diff
changeset
|
557 Got arguments 1:user@dummy 2:hg -R remote serve --stdio |
86fc364ca5f8
sshrepo: don't quote obviously safe strings (issue2983)
Mads Kiilerich <mads@kiilerich.com>
parents:
15581
diff
changeset
|
558 Got arguments 1:user@dummy 2:hg -R remote serve --stdio |
86fc364ca5f8
sshrepo: don't quote obviously safe strings (issue2983)
Mads Kiilerich <mads@kiilerich.com>
parents:
15581
diff
changeset
|
559 Got arguments 1:user@dummy 2:hg -R remote serve --stdio |
31747
aff7b32b3c05
hook: add hook name information to external hook
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
31746
diff
changeset
|
560 changegroup-in-remote hook: HG_BUNDLE2=1 HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=1383141674ec756a6056f6a9097618482fe0f4a6 HG_NODE_LAST=1383141674ec756a6056f6a9097618482fe0f4a6 HG_SOURCE=serve HG_TXNID=TXN:$ID$ HG_URL=remote:ssh:$LOCALIP |
15622
86fc364ca5f8
sshrepo: don't quote obviously safe strings (issue2983)
Mads Kiilerich <mads@kiilerich.com>
parents:
15581
diff
changeset
|
561 Got arguments 1:user@dummy 2:hg -R remote serve --stdio |
86fc364ca5f8
sshrepo: don't quote obviously safe strings (issue2983)
Mads Kiilerich <mads@kiilerich.com>
parents:
15581
diff
changeset
|
562 Got arguments 1:user@dummy 2:hg init 'a repo' |
86fc364ca5f8
sshrepo: don't quote obviously safe strings (issue2983)
Mads Kiilerich <mads@kiilerich.com>
parents:
15581
diff
changeset
|
563 Got arguments 1:user@dummy 2:hg -R 'a repo' serve --stdio |
86fc364ca5f8
sshrepo: don't quote obviously safe strings (issue2983)
Mads Kiilerich <mads@kiilerich.com>
parents:
15581
diff
changeset
|
564 Got arguments 1:user@dummy 2:hg -R 'a repo' serve --stdio |
17844
b32e55e6c3c7
clone: don't %-escape the default destination (issue3145)
Matt Mackall <mpm@selenic.com>
parents:
17298
diff
changeset
|
565 Got arguments 1:user@dummy 2:hg -R 'a repo' serve --stdio |
21188
d36440d84328
httppeer: reintroduce _abort that accidentally was removed in 167047ba3cfa
Mads Kiilerich <madski@unity3d.com>
parents:
20501
diff
changeset
|
566 Got arguments 1:user@dummy 2:hg -R 'a repo' serve --stdio |
22247
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
567 Got arguments 1:user@dummy 2:hg -R remote serve --stdio |
31747
aff7b32b3c05
hook: add hook name information to external hook
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
31746
diff
changeset
|
568 changegroup-in-remote hook: HG_BUNDLE2=1 HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=65c38f4125f9602c8db4af56530cc221d93b8ef8 HG_NODE_LAST=65c38f4125f9602c8db4af56530cc221d93b8ef8 HG_SOURCE=serve HG_TXNID=TXN:$ID$ HG_URL=remote:ssh:$LOCALIP |
25338
405303df6a2a
ssh: test some no-op pull through ssh with --debug
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25127
diff
changeset
|
569 Got arguments 1:user@dummy 2:hg -R remote serve --stdio |
26828
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
570 |
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
571 remote hook failure is attributed to remote |
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
572 |
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
573 $ cat > $TESTTMP/failhook << EOF |
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
574 > def hook(ui, repo, **kwargs): |
38108
e69628f36196
py3: add b'' prefixes in tests/test-ssh.t and tests/test-ssh-bundle1.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37943
diff
changeset
|
575 > ui.write(b'hook failure!\n') |
26828
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
576 > ui.flush() |
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
577 > return 1 |
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
578 > EOF |
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
579 |
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
580 $ echo "pretxnchangegroup.fail = python:$TESTTMP/failhook:hook" >> remote/.hg/hgrc |
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
581 |
33335
72f051f9a7d8
tests: quote $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
33286
diff
changeset
|
582 $ hg -q --config ui.ssh="\"$PYTHON\" $TESTDIR/dummyssh" clone ssh://user@dummy/remote hookout |
26828
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
583 $ cd hookout |
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
584 $ touch hookfailure |
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
585 $ hg -q commit -A -m 'remote hook failure' |
33335
72f051f9a7d8
tests: quote $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
33286
diff
changeset
|
586 $ hg --config ui.ssh="\"$PYTHON\" $TESTDIR/dummyssh" push |
26828
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
587 pushing to ssh://user@dummy/remote |
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
588 searching for changes |
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
589 remote: adding changesets |
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
590 remote: adding manifests |
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
591 remote: adding file changes |
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
592 remote: added 1 changesets with 1 changes to 1 files |
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
593 remote: hook failure! |
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
594 remote: transaction abort! |
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
595 remote: rollback completed |
26829
58f1645f72c3
bundle2: attribute remote failures to remote (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26828
diff
changeset
|
596 remote: pretxnchangegroup.fail hook failed |
58f1645f72c3
bundle2: attribute remote failures to remote (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26828
diff
changeset
|
597 abort: push failed on remote |
26828
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
598 [255] |
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
599 |
30914
f3807a135e43
wireproto: properly report server Abort during 'getbundle'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30563
diff
changeset
|
600 abort during pull is properly reported as such |
f3807a135e43
wireproto: properly report server Abort during 'getbundle'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30563
diff
changeset
|
601 |
f3807a135e43
wireproto: properly report server Abort during 'getbundle'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30563
diff
changeset
|
602 $ echo morefoo >> ../remote/foo |
f3807a135e43
wireproto: properly report server Abort during 'getbundle'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30563
diff
changeset
|
603 $ hg -R ../remote commit --message "more foo to be pulled" |
f3807a135e43
wireproto: properly report server Abort during 'getbundle'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30563
diff
changeset
|
604 $ cat >> ../remote/.hg/hgrc << EOF |
f3807a135e43
wireproto: properly report server Abort during 'getbundle'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30563
diff
changeset
|
605 > [extensions] |
f3807a135e43
wireproto: properly report server Abort during 'getbundle'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30563
diff
changeset
|
606 > crash = ${TESTDIR}/crashgetbundler.py |
f3807a135e43
wireproto: properly report server Abort during 'getbundle'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30563
diff
changeset
|
607 > EOF |
33335
72f051f9a7d8
tests: quote $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
33286
diff
changeset
|
608 $ hg --config ui.ssh="\"$PYTHON\" $TESTDIR/dummyssh" pull |
30914
f3807a135e43
wireproto: properly report server Abort during 'getbundle'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30563
diff
changeset
|
609 pulling from ssh://user@dummy/remote |
f3807a135e43
wireproto: properly report server Abort during 'getbundle'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30563
diff
changeset
|
610 searching for changes |
f3807a135e43
wireproto: properly report server Abort during 'getbundle'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30563
diff
changeset
|
611 remote: abort: this is an exercise |
f3807a135e43
wireproto: properly report server Abort during 'getbundle'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30563
diff
changeset
|
612 abort: pull failed on remote |
f3807a135e43
wireproto: properly report server Abort during 'getbundle'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30563
diff
changeset
|
613 [255] |
35108
8b1c887d52e7
sshpeer: add a configurable hint for the ssh error message
Zuzanna Mroczek <zuza@fb.com>
parents:
35074
diff
changeset
|
614 |
8b1c887d52e7
sshpeer: add a configurable hint for the ssh error message
Zuzanna Mroczek <zuza@fb.com>
parents:
35074
diff
changeset
|
615 abort with no error hint when there is a ssh problem when pulling |
8b1c887d52e7
sshpeer: add a configurable hint for the ssh error message
Zuzanna Mroczek <zuza@fb.com>
parents:
35074
diff
changeset
|
616 |
35180
3180ff7f6025
test-ssh: do not actually look up "brokenrepository" by DNS
Yuya Nishihara <yuya@tcha.org>
parents:
35108
diff
changeset
|
617 $ hg pull ssh://brokenrepository -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" |
35108
8b1c887d52e7
sshpeer: add a configurable hint for the ssh error message
Zuzanna Mroczek <zuza@fb.com>
parents:
35074
diff
changeset
|
618 pulling from ssh://brokenrepository/ |
8b1c887d52e7
sshpeer: add a configurable hint for the ssh error message
Zuzanna Mroczek <zuza@fb.com>
parents:
35074
diff
changeset
|
619 abort: no suitable response from remote hg! |
8b1c887d52e7
sshpeer: add a configurable hint for the ssh error message
Zuzanna Mroczek <zuza@fb.com>
parents:
35074
diff
changeset
|
620 [255] |
8b1c887d52e7
sshpeer: add a configurable hint for the ssh error message
Zuzanna Mroczek <zuza@fb.com>
parents:
35074
diff
changeset
|
621 |
8b1c887d52e7
sshpeer: add a configurable hint for the ssh error message
Zuzanna Mroczek <zuza@fb.com>
parents:
35074
diff
changeset
|
622 abort with configured error hint when there is a ssh problem when pulling |
8b1c887d52e7
sshpeer: add a configurable hint for the ssh error message
Zuzanna Mroczek <zuza@fb.com>
parents:
35074
diff
changeset
|
623 |
35180
3180ff7f6025
test-ssh: do not actually look up "brokenrepository" by DNS
Yuya Nishihara <yuya@tcha.org>
parents:
35108
diff
changeset
|
624 $ hg pull ssh://brokenrepository -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" \ |
3180ff7f6025
test-ssh: do not actually look up "brokenrepository" by DNS
Yuya Nishihara <yuya@tcha.org>
parents:
35108
diff
changeset
|
625 > --config ui.ssherrorhint="Please see http://company/internalwiki/ssh.html" |
35108
8b1c887d52e7
sshpeer: add a configurable hint for the ssh error message
Zuzanna Mroczek <zuza@fb.com>
parents:
35074
diff
changeset
|
626 pulling from ssh://brokenrepository/ |
8b1c887d52e7
sshpeer: add a configurable hint for the ssh error message
Zuzanna Mroczek <zuza@fb.com>
parents:
35074
diff
changeset
|
627 abort: no suitable response from remote hg! |
8b1c887d52e7
sshpeer: add a configurable hint for the ssh error message
Zuzanna Mroczek <zuza@fb.com>
parents:
35074
diff
changeset
|
628 (Please see http://company/internalwiki/ssh.html) |
8b1c887d52e7
sshpeer: add a configurable hint for the ssh error message
Zuzanna Mroczek <zuza@fb.com>
parents:
35074
diff
changeset
|
629 [255] |
35436
31d21309635b
sshpeer: allow for additional environment passing to ssh exe
Kostia Balytskyi <ikostia@fb.com>
parents:
35393
diff
changeset
|
630 |
31d21309635b
sshpeer: allow for additional environment passing to ssh exe
Kostia Balytskyi <ikostia@fb.com>
parents:
35393
diff
changeset
|
631 test that custom environment is passed down to ssh executable |
31d21309635b
sshpeer: allow for additional environment passing to ssh exe
Kostia Balytskyi <ikostia@fb.com>
parents:
35393
diff
changeset
|
632 $ cat >>dumpenv <<EOF |
31d21309635b
sshpeer: allow for additional environment passing to ssh exe
Kostia Balytskyi <ikostia@fb.com>
parents:
35393
diff
changeset
|
633 > #! /bin/sh |
31d21309635b
sshpeer: allow for additional environment passing to ssh exe
Kostia Balytskyi <ikostia@fb.com>
parents:
35393
diff
changeset
|
634 > echo \$VAR >&2 |
31d21309635b
sshpeer: allow for additional environment passing to ssh exe
Kostia Balytskyi <ikostia@fb.com>
parents:
35393
diff
changeset
|
635 > EOF |
31d21309635b
sshpeer: allow for additional environment passing to ssh exe
Kostia Balytskyi <ikostia@fb.com>
parents:
35393
diff
changeset
|
636 $ chmod +x dumpenv |
35484
1853c8677160
test-ssh: stabilize for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
35436
diff
changeset
|
637 $ hg pull ssh://something --config ui.ssh="sh dumpenv" |
35436
31d21309635b
sshpeer: allow for additional environment passing to ssh exe
Kostia Balytskyi <ikostia@fb.com>
parents:
35393
diff
changeset
|
638 pulling from ssh://something/ |
31d21309635b
sshpeer: allow for additional environment passing to ssh exe
Kostia Balytskyi <ikostia@fb.com>
parents:
35393
diff
changeset
|
639 remote: |
31d21309635b
sshpeer: allow for additional environment passing to ssh exe
Kostia Balytskyi <ikostia@fb.com>
parents:
35393
diff
changeset
|
640 abort: no suitable response from remote hg! |
31d21309635b
sshpeer: allow for additional environment passing to ssh exe
Kostia Balytskyi <ikostia@fb.com>
parents:
35393
diff
changeset
|
641 [255] |
35484
1853c8677160
test-ssh: stabilize for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
35436
diff
changeset
|
642 $ hg pull ssh://something --config ui.ssh="sh dumpenv" --config sshenv.VAR=17 |
35436
31d21309635b
sshpeer: allow for additional environment passing to ssh exe
Kostia Balytskyi <ikostia@fb.com>
parents:
35393
diff
changeset
|
643 pulling from ssh://something/ |
31d21309635b
sshpeer: allow for additional environment passing to ssh exe
Kostia Balytskyi <ikostia@fb.com>
parents:
35393
diff
changeset
|
644 remote: 17 |
31d21309635b
sshpeer: allow for additional environment passing to ssh exe
Kostia Balytskyi <ikostia@fb.com>
parents:
35393
diff
changeset
|
645 abort: no suitable response from remote hg! |
31d21309635b
sshpeer: allow for additional environment passing to ssh exe
Kostia Balytskyi <ikostia@fb.com>
parents:
35393
diff
changeset
|
646 [255] |
31d21309635b
sshpeer: allow for additional environment passing to ssh exe
Kostia Balytskyi <ikostia@fb.com>
parents:
35393
diff
changeset
|
647 |