Mercurial > hg > mercurial-source
annotate tests/test-ssh.t @ 36578:1d118f9f4f57
bundle2: always advertise client support for stream parts
Previously, enabling of stream clone over bundle2 was a server-side
only change. And clients would only advertise bundle2 support for
stream clones if an experimental config option was set.
This situation wasn't forward compatible because in the future
(when the feature is enabled on servers by default), an old client
would send a request to the server but it wouldn't send its own
bundle2 capability support for stream parts. Servers would have to
infer that clients not sending this capability were old Mercurial
clients that only sent the capability if the feature was
explicitly enabled. Implicit and inferred behavior makes implementing
servers hard. It's much better to be explicit about client features.
We should either make the config option for bundle2 stream clones
disable the feature client-side as well (so a server doesn't see
a request from a client not advertising stream support). Or we
should always advertise stream support if a client is willing
to accept stream parts.
Since I anticipating stabilizing stream clone support in bundle2
quickly, I think it's safe to always advertise client support
in the bundle2 capabilities. So this commit changes things to
do that.
Because capabilities now vary between client and server, we had
to create variations of the variable substitutions for those
strings.
Differential Revision: https://phab.mercurial-scm.org/D1931
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Mon, 22 Jan 2018 12:23:47 -0800 |
parents | f7ef49e44d7c |
children | 1ee1a42bfdae |
rev | line source |
---|---|
4291
35b2e02367a5
test-ssh: use printenv.py
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3853
diff
changeset
|
1 |
12414 | 2 This test tries to exercise the ssh functionality with a dummy script |
1110 | 3 |
27571
dc2016eb326b
test: use generaldelta in 'test-ssh.t'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27469
diff
changeset
|
4 $ cat <<EOF >> $HGRCPATH |
dc2016eb326b
test: use generaldelta in 'test-ssh.t'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27469
diff
changeset
|
5 > [format] |
dc2016eb326b
test: use generaldelta in 'test-ssh.t'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27469
diff
changeset
|
6 > usegeneraldelta=yes |
dc2016eb326b
test: use generaldelta in 'test-ssh.t'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27469
diff
changeset
|
7 > EOF |
dc2016eb326b
test: use generaldelta in 'test-ssh.t'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27469
diff
changeset
|
8 |
14185
eb297845f90b
tests: fix test-ssh.t after 6bd9778ae749
Mads Kiilerich <mads@kiilerich.com>
parents:
14166
diff
changeset
|
9 creating 'remote' repo |
4298
58517f6eb1ad
test-ssh: avoid a shell script
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4291
diff
changeset
|
10 |
12414 | 11 $ hg init remote |
12 $ cd remote | |
13 $ echo this > foo | |
14 $ echo this > fooO | |
15 $ 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
|
16 |
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
17 insert a closed branch (issue4428) |
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
18 |
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
19 $ hg up null |
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
20 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
|
21 $ hg branch closed |
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
22 marked working directory as branch closed |
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
23 (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
|
24 $ hg ci -mc0 |
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
25 $ hg ci --close-branch -mc1 |
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
26 $ hg up -q default |
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
27 |
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
28 configure for serving |
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
29 |
14185
eb297845f90b
tests: fix test-ssh.t after 6bd9778ae749
Mads Kiilerich <mads@kiilerich.com>
parents:
14166
diff
changeset
|
30 $ 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
|
31 > [server] |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
32 > uncompressed = True |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
33 > |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
34 > [hooks] |
31013
34a5f6c66bc5
tests: invoke printenv.py via sh -c for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
30934
diff
changeset
|
35 > 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
|
36 > EOF |
12414 | 37 $ cd .. |
1110 | 38 |
12414 | 39 repo not found error |
40 | |
34118
72f051f9a7d8
tests: quote $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
34069
diff
changeset
|
41 $ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" ssh://user@dummy/nonexistent local |
26738
7332bf4ae959
dispatch: error out on invalid -R path even if optionalrepo (issue4805) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
26737
diff
changeset
|
42 remote: abort: repository nonexistent not found! |
12414 | 43 abort: no suitable response from remote hg! |
44 [255] | |
45 | |
46 non-existent absolute path | |
1110 | 47 |
34118
72f051f9a7d8
tests: quote $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
34069
diff
changeset
|
48 $ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" ssh://user@dummy/`pwd`/nonexistent local |
26738
7332bf4ae959
dispatch: error out on invalid -R path even if optionalrepo (issue4805) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
26737
diff
changeset
|
49 remote: abort: repository $TESTTMP/nonexistent not found! |
12414 | 50 abort: no suitable response from remote hg! |
51 [255] | |
52 | |
53 clone remote via stream | |
1110 | 54 |
35176
fffd3369aa83
commands: rename clone --uncompressed to --stream and document
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35105
diff
changeset
|
55 $ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" --stream ssh://user@dummy/remote local-stream |
12414 | 56 streaming all changes |
30934
b7a966ce89ed
changelog: disable delta chains
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29814
diff
changeset
|
57 4 files to transfer, 602 bytes of data |
b7a966ce89ed
changelog: disable delta chains
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29814
diff
changeset
|
58 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
|
59 searching for changes |
2dc6b7917cdf
clone: fix copying bookmarks in uncompressed clones (issue4430)
Durham Goode <durham@fb.com>
parents:
22960
diff
changeset
|
60 no changes found |
12414 | 61 updating to branch default |
12489 | 62 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
12414 | 63 $ cd local-stream |
64 $ hg verify | |
65 checking changesets | |
66 checking manifests | |
67 crosschecking files in changesets and manifests | |
68 checking files | |
23126
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
69 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
|
70 $ hg branches |
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
71 default 0:1160648e36ce |
12414 | 72 $ cd .. |
73 | |
23116
2dc6b7917cdf
clone: fix copying bookmarks in uncompressed clones (issue4430)
Durham Goode <durham@fb.com>
parents:
22960
diff
changeset
|
74 clone bookmarks via stream |
2dc6b7917cdf
clone: fix copying bookmarks in uncompressed clones (issue4430)
Durham Goode <durham@fb.com>
parents:
22960
diff
changeset
|
75 |
2dc6b7917cdf
clone: fix copying bookmarks in uncompressed clones (issue4430)
Durham Goode <durham@fb.com>
parents:
22960
diff
changeset
|
76 $ hg -R local-stream book mybook |
35176
fffd3369aa83
commands: rename clone --uncompressed to --stream and document
Gregory Szorc <gregory.szorc@gmail.com>
parents:
35105
diff
changeset
|
77 $ 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
|
78 streaming all changes |
30934
b7a966ce89ed
changelog: disable delta chains
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29814
diff
changeset
|
79 4 files to transfer, 602 bytes of data |
b7a966ce89ed
changelog: disable delta chains
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29814
diff
changeset
|
80 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
|
81 searching for changes |
2dc6b7917cdf
clone: fix copying bookmarks in uncompressed clones (issue4430)
Durham Goode <durham@fb.com>
parents:
22960
diff
changeset
|
82 no changes found |
2dc6b7917cdf
clone: fix copying bookmarks in uncompressed clones (issue4430)
Durham Goode <durham@fb.com>
parents:
22960
diff
changeset
|
83 updating to branch default |
2dc6b7917cdf
clone: fix copying bookmarks in uncompressed clones (issue4430)
Durham Goode <durham@fb.com>
parents:
22960
diff
changeset
|
84 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
|
85 $ cd stream2 |
2dc6b7917cdf
clone: fix copying bookmarks in uncompressed clones (issue4430)
Durham Goode <durham@fb.com>
parents:
22960
diff
changeset
|
86 $ hg book |
2dc6b7917cdf
clone: fix copying bookmarks in uncompressed clones (issue4430)
Durham Goode <durham@fb.com>
parents:
22960
diff
changeset
|
87 mybook 0:1160648e36ce |
2dc6b7917cdf
clone: fix copying bookmarks in uncompressed clones (issue4430)
Durham Goode <durham@fb.com>
parents:
22960
diff
changeset
|
88 $ cd .. |
2dc6b7917cdf
clone: fix copying bookmarks in uncompressed clones (issue4430)
Durham Goode <durham@fb.com>
parents:
22960
diff
changeset
|
89 $ rm -rf local-stream stream2 |
2dc6b7917cdf
clone: fix copying bookmarks in uncompressed clones (issue4430)
Durham Goode <durham@fb.com>
parents:
22960
diff
changeset
|
90 |
12414 | 91 clone remote via pull |
5990
7939c71f3132
sshrepo: be more careful while reading data
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4298
diff
changeset
|
92 |
34118
72f051f9a7d8
tests: quote $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
34069
diff
changeset
|
93 $ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote local |
12414 | 94 requesting all changes |
95 adding changesets | |
96 adding manifests | |
97 adding file changes | |
23126
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
98 added 3 changesets with 2 changes to 2 files |
35444
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
35176
diff
changeset
|
99 new changesets 1160648e36ce:ad076bfb429d |
12414 | 100 updating to branch default |
101 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
102 | |
103 verify | |
1110 | 104 |
12414 | 105 $ cd local |
106 $ hg verify | |
107 checking changesets | |
108 checking manifests | |
109 crosschecking files in changesets and manifests | |
110 checking files | |
23126
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
111 2 files, 3 changesets, 2 total revisions |
31013
34a5f6c66bc5
tests: invoke printenv.py via sh -c for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
30934
diff
changeset
|
112 $ cat >> .hg/hgrc <<EOF |
34a5f6c66bc5
tests: invoke printenv.py via sh -c for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
30934
diff
changeset
|
113 > [hooks] |
34a5f6c66bc5
tests: invoke printenv.py via sh -c for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
30934
diff
changeset
|
114 > 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:
30934
diff
changeset
|
115 > EOF |
1110 | 116 |
12414 | 117 empty default pull |
3274
7ae37d99d47e
ssh: make the error message more clear, add a testcase
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3092
diff
changeset
|
118 |
12414 | 119 $ hg paths |
120 default = ssh://user@dummy/remote | |
34118
72f051f9a7d8
tests: quote $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
34069
diff
changeset
|
121 $ hg pull -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" |
12414 | 122 pulling from ssh://user@dummy/remote |
123 searching for changes | |
124 no changes found | |
125 | |
24193
eabe44ec5af5
pull: print "pulling from foo" before accessing the other repo
Thomas Arendsen Hein <thomas@intevation.de>
parents:
23416
diff
changeset
|
126 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
|
127 |
34118
72f051f9a7d8
tests: quote $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
34069
diff
changeset
|
128 $ hg pull -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" ssh://user@dummy/doesnotexist |
24193
eabe44ec5af5
pull: print "pulling from foo" before accessing the other repo
Thomas Arendsen Hein <thomas@intevation.de>
parents:
23416
diff
changeset
|
129 pulling from ssh://user@dummy/doesnotexist |
26738
7332bf4ae959
dispatch: error out on invalid -R path even if optionalrepo (issue4805) (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
26737
diff
changeset
|
130 remote: abort: repository doesnotexist not found! |
24193
eabe44ec5af5
pull: print "pulling from foo" before accessing the other repo
Thomas Arendsen Hein <thomas@intevation.de>
parents:
23416
diff
changeset
|
131 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
|
132 [255] |
eabe44ec5af5
pull: print "pulling from foo" before accessing the other repo
Thomas Arendsen Hein <thomas@intevation.de>
parents:
23416
diff
changeset
|
133 |
12414 | 134 local change |
12409
0eaf7d32a5d8
test-ssh: test absolute paths in SSH URLs
Brodie Rao <brodie@bitheap.org>
parents:
12156
diff
changeset
|
135 |
12414 | 136 $ echo bleah > foo |
137 $ hg ci -m "add" | |
138 | |
139 updating rc | |
140 | |
141 $ echo "default-push = ssh://user@dummy/remote" >> .hg/hgrc | |
142 $ echo "[ui]" >> .hg/hgrc | |
34118
72f051f9a7d8
tests: quote $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
34069
diff
changeset
|
143 $ echo "ssh = \"$PYTHON\" \"$TESTDIR/dummyssh\"" >> .hg/hgrc |
12414 | 144 |
145 find outgoing | |
2612
ffb895f16925
add support for streaming clone.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2439
diff
changeset
|
146 |
12414 | 147 $ hg out ssh://user@dummy/remote |
148 comparing with ssh://user@dummy/remote | |
149 searching for changes | |
23126
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
150 changeset: 3:a28a9d1a809c |
12414 | 151 tag: tip |
23126
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
152 parent: 0:1160648e36ce |
12414 | 153 user: test |
154 date: Thu Jan 01 00:00:00 1970 +0000 | |
155 summary: add | |
156 | |
1110 | 157 |
12414 | 158 find incoming on the remote side |
1110 | 159 |
34118
72f051f9a7d8
tests: quote $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
34069
diff
changeset
|
160 $ hg incoming -R ../remote -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" ssh://user@dummy/local |
12414 | 161 comparing with ssh://user@dummy/local |
162 searching for changes | |
23126
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
163 changeset: 3:a28a9d1a809c |
12414 | 164 tag: tip |
23126
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
165 parent: 0:1160648e36ce |
12414 | 166 user: test |
167 date: Thu Jan 01 00:00:00 1970 +0000 | |
168 summary: add | |
169 | |
1110 | 170 |
12504
f7dd8bffe18c
test-ssh: test absolute path that exists
Brodie Rao <brodie@bitheap.org>
parents:
12489
diff
changeset
|
171 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
|
172 |
34118
72f051f9a7d8
tests: quote $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
34069
diff
changeset
|
173 $ 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
|
174 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
|
175 searching for changes |
23126
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
176 changeset: 3:a28a9d1a809c |
12504
f7dd8bffe18c
test-ssh: test absolute path that exists
Brodie Rao <brodie@bitheap.org>
parents:
12489
diff
changeset
|
177 tag: tip |
23126
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
178 parent: 0:1160648e36ce |
12504
f7dd8bffe18c
test-ssh: test absolute path that exists
Brodie Rao <brodie@bitheap.org>
parents:
12489
diff
changeset
|
179 user: test |
f7dd8bffe18c
test-ssh: test absolute path that exists
Brodie Rao <brodie@bitheap.org>
parents:
12489
diff
changeset
|
180 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
|
181 summary: add |
f7dd8bffe18c
test-ssh: test absolute path that exists
Brodie Rao <brodie@bitheap.org>
parents:
12489
diff
changeset
|
182 |
f7dd8bffe18c
test-ssh: test absolute path that exists
Brodie Rao <brodie@bitheap.org>
parents:
12489
diff
changeset
|
183 |
12414 | 184 push |
1110 | 185 |
12414 | 186 $ hg push |
187 pushing to ssh://user@dummy/remote | |
188 searching for changes | |
189 remote: adding changesets | |
190 remote: adding manifests | |
191 remote: adding file changes | |
192 remote: added 1 changesets with 1 changes to 1 files | |
193 $ cd ../remote | |
194 | |
195 check remote tip | |
1110 | 196 |
12414 | 197 $ hg tip |
23126
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
198 changeset: 3:a28a9d1a809c |
12414 | 199 tag: tip |
23126
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
200 parent: 0:1160648e36ce |
12414 | 201 user: test |
202 date: Thu Jan 01 00:00:00 1970 +0000 | |
203 summary: add | |
204 | |
205 $ hg verify | |
206 checking changesets | |
207 checking manifests | |
208 crosschecking files in changesets and manifests | |
209 checking files | |
23126
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
210 2 files, 4 changesets, 3 total revisions |
12414 | 211 $ hg cat -r tip foo |
212 bleah | |
213 $ echo z > z | |
214 $ hg ci -A -m z z | |
215 created new head | |
1982
70ba0c86da8b
Added test for incoming via ssh.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1933
diff
changeset
|
216 |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
217 test pushkeys and bookmarks |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
218 |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
219 $ cd ../local |
34118
72f051f9a7d8
tests: quote $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
34069
diff
changeset
|
220 $ 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
|
221 bookmarks |
18255
7ca534f31a83
debugpushkey: list keys sorted
Mads Kiilerich <mads at kiilerich.com>
parents:
17844
diff
changeset
|
222 namespaces |
15648
79cc89de5be1
phases: add basic pushkey support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15622
diff
changeset
|
223 phases |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
224 $ hg book foo -r 0 |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
225 $ hg out -B |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
226 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
|
227 searching for changed bookmarks |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
228 foo 1160648e36ce |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
229 $ hg push -B foo |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
230 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
|
231 searching for changes |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
232 no changes found |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
233 exporting bookmark foo |
16038
dad96e752079
push: don't treat bookmark as a found change
Matt Mackall <mpm@selenic.com>
parents:
16023
diff
changeset
|
234 [1] |
34118
72f051f9a7d8
tests: quote $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
34069
diff
changeset
|
235 $ 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
|
236 foo 1160648e36cec0054048a7edc4110c6f84fde594 |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
237 $ hg book -f foo |
13050 | 238 $ hg push --traceback |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
239 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
|
240 searching for changes |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
241 no changes found |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
242 updating bookmark foo |
16023
90f8b8dd0326
push: return 1 if no changes found (issue3228)
Matt Mackall <mpm@selenic.com>
parents:
15897
diff
changeset
|
243 [1] |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
244 $ hg book -d foo |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
245 $ hg in -B |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
246 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
|
247 searching for changed bookmarks |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
248 foo a28a9d1a809c |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
249 $ 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
|
250 $ hg pull -B foo |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
251 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
|
252 no changes found |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
253 updating bookmark foo |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
254 $ hg book -d foo |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
255 $ hg push -B foo |
13368
d4ab9486e514
bookmarks: move push/pull command features to core
Matt Mackall <mpm@selenic.com>
parents:
13050
diff
changeset
|
256 pushing to ssh://user@dummy/remote |
d4ab9486e514
bookmarks: move push/pull command features to core
Matt Mackall <mpm@selenic.com>
parents:
13050
diff
changeset
|
257 searching for changes |
d4ab9486e514
bookmarks: move push/pull command features to core
Matt Mackall <mpm@selenic.com>
parents:
13050
diff
changeset
|
258 no changes found |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
259 deleting remote bookmark foo |
16038
dad96e752079
push: don't treat bookmark as a found change
Matt Mackall <mpm@selenic.com>
parents:
16023
diff
changeset
|
260 [1] |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
261 |
12414 | 262 a bad, evil hook that prints to stdout |
1110 | 263 |
14186
8513bd2e7259
tests: share dummyssh
Mads Kiilerich <mads@kiilerich.com>
parents:
14185
diff
changeset
|
264 $ cat <<EOF > $TESTTMP/badhook |
8513bd2e7259
tests: share dummyssh
Mads Kiilerich <mads@kiilerich.com>
parents:
14185
diff
changeset
|
265 > import sys |
8513bd2e7259
tests: share dummyssh
Mads Kiilerich <mads@kiilerich.com>
parents:
14185
diff
changeset
|
266 > sys.stdout.write("KABOOM\n") |
8513bd2e7259
tests: share dummyssh
Mads Kiilerich <mads@kiilerich.com>
parents:
14185
diff
changeset
|
267 > EOF |
8513bd2e7259
tests: share dummyssh
Mads Kiilerich <mads@kiilerich.com>
parents:
14185
diff
changeset
|
268 |
31143
ad56204f733e
hook: flush stdout before restoring stderr redirection
Yuya Nishihara <yuya@tcha.org>
parents:
31013
diff
changeset
|
269 $ cat <<EOF > $TESTTMP/badpyhook.py |
ad56204f733e
hook: flush stdout before restoring stderr redirection
Yuya Nishihara <yuya@tcha.org>
parents:
31013
diff
changeset
|
270 > import sys |
ad56204f733e
hook: flush stdout before restoring stderr redirection
Yuya Nishihara <yuya@tcha.org>
parents:
31013
diff
changeset
|
271 > def hook(ui, repo, hooktype, **kwargs): |
ad56204f733e
hook: flush stdout before restoring stderr redirection
Yuya Nishihara <yuya@tcha.org>
parents:
31013
diff
changeset
|
272 > sys.stdout.write("KABOOM IN PROCESS\n") |
ad56204f733e
hook: flush stdout before restoring stderr redirection
Yuya Nishihara <yuya@tcha.org>
parents:
31013
diff
changeset
|
273 > EOF |
ad56204f733e
hook: flush stdout before restoring stderr redirection
Yuya Nishihara <yuya@tcha.org>
parents:
31013
diff
changeset
|
274 |
ad56204f733e
hook: flush stdout before restoring stderr redirection
Yuya Nishihara <yuya@tcha.org>
parents:
31013
diff
changeset
|
275 $ cat <<EOF >> ../remote/.hg/hgrc |
ad56204f733e
hook: flush stdout before restoring stderr redirection
Yuya Nishihara <yuya@tcha.org>
parents:
31013
diff
changeset
|
276 > [hooks] |
34045
8e6f4939a69a
tests: replace yet more calls to `python` with $PYTHON
Augie Fackler <augie@google.com>
parents:
32833
diff
changeset
|
277 > changegroup.stdout = $PYTHON $TESTTMP/badhook |
31143
ad56204f733e
hook: flush stdout before restoring stderr redirection
Yuya Nishihara <yuya@tcha.org>
parents:
31013
diff
changeset
|
278 > changegroup.pystdout = python:$TESTTMP/badpyhook.py:hook |
ad56204f733e
hook: flush stdout before restoring stderr redirection
Yuya Nishihara <yuya@tcha.org>
parents:
31013
diff
changeset
|
279 > EOF |
12414 | 280 $ echo r > r |
281 $ hg ci -A -m z r | |
282 | |
283 push should succeed even though it has an unexpected response | |
1110 | 284 |
12414 | 285 $ hg push |
286 pushing to ssh://user@dummy/remote | |
287 searching for changes | |
20501
8a9e0b523d2d
discovery: improve "note: unsynced remote changes!" warning
Mads Kiilerich <madski@unity3d.com>
parents:
20403
diff
changeset
|
288 remote has heads on branch 'default' that are not known locally: 6c0482d977a3 |
12414 | 289 remote: adding changesets |
290 remote: adding manifests | |
291 remote: adding file changes | |
292 remote: added 1 changesets with 1 changes to 1 files | |
293 remote: KABOOM | |
31143
ad56204f733e
hook: flush stdout before restoring stderr redirection
Yuya Nishihara <yuya@tcha.org>
parents:
31013
diff
changeset
|
294 remote: KABOOM IN PROCESS |
12414 | 295 $ hg -R ../remote heads |
23126
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
296 changeset: 5:1383141674ec |
12414 | 297 tag: tip |
23126
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
298 parent: 3:a28a9d1a809c |
12414 | 299 user: test |
300 date: Thu Jan 01 00:00:00 1970 +0000 | |
301 summary: z | |
302 | |
23126
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
303 changeset: 4:6c0482d977a3 |
12414 | 304 parent: 0:1160648e36ce |
305 user: test | |
306 date: Thu Jan 01 00:00:00 1970 +0000 | |
307 summary: z | |
308 | |
13464
da0ddd62b9d8
sshrepo: catch passwords in ssh urls
Adrian Buehlmann <adrian@cadifra.com>
parents:
13405
diff
changeset
|
309 |
13604
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
310 clone bookmarks |
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
311 |
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
312 $ hg -R ../remote bookmark test |
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
313 $ hg -R ../remote bookmarks |
23126
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
314 * test 4:6c0482d977a3 |
34118
72f051f9a7d8
tests: quote $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
34069
diff
changeset
|
315 $ 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
|
316 requesting all changes |
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
317 adding changesets |
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
318 adding manifests |
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
319 adding file changes |
23126
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
320 added 6 changesets with 5 changes to 4 files (+1 heads) |
35444
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
35176
diff
changeset
|
321 new changesets 1160648e36ce:1383141674ec |
13604
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
322 updating to branch default |
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
323 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
|
324 $ hg -R local-bookmarks bookmarks |
23126
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
325 test 4:6c0482d977a3 |
13604
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
326 |
13464
da0ddd62b9d8
sshrepo: catch passwords in ssh urls
Adrian Buehlmann <adrian@cadifra.com>
parents:
13405
diff
changeset
|
327 passwords in ssh urls are not supported |
13755 | 328 (we use a glob here because different Python versions give different |
329 results here) | |
13464
da0ddd62b9d8
sshrepo: catch passwords in ssh urls
Adrian Buehlmann <adrian@cadifra.com>
parents:
13405
diff
changeset
|
330 |
da0ddd62b9d8
sshrepo: catch passwords in ssh urls
Adrian Buehlmann <adrian@cadifra.com>
parents:
13405
diff
changeset
|
331 $ hg push ssh://user:erroneouspwd@dummy/remote |
13755 | 332 pushing to ssh://user:*@dummy/remote (glob) |
13464
da0ddd62b9d8
sshrepo: catch passwords in ssh urls
Adrian Buehlmann <adrian@cadifra.com>
parents:
13405
diff
changeset
|
333 abort: password in URL not supported! |
da0ddd62b9d8
sshrepo: catch passwords in ssh urls
Adrian Buehlmann <adrian@cadifra.com>
parents:
13405
diff
changeset
|
334 [255] |
da0ddd62b9d8
sshrepo: catch passwords in ssh urls
Adrian Buehlmann <adrian@cadifra.com>
parents:
13405
diff
changeset
|
335 |
12414 | 336 $ cd .. |
15581
d8fa35c28335
ssh: quote remote paths (issue2983)
Mads Kiilerich <mads@kiilerich.com>
parents:
14186
diff
changeset
|
337 |
17003
73d20de5f30b
tests: add missing no-outer-repo requirements
Mads Kiilerich <mads@kiilerich.com>
parents:
16982
diff
changeset
|
338 hide outer repo |
73d20de5f30b
tests: add missing no-outer-repo requirements
Mads Kiilerich <mads@kiilerich.com>
parents:
16982
diff
changeset
|
339 $ hg init |
73d20de5f30b
tests: add missing no-outer-repo requirements
Mads Kiilerich <mads@kiilerich.com>
parents:
16982
diff
changeset
|
340 |
15581
d8fa35c28335
ssh: quote remote paths (issue2983)
Mads Kiilerich <mads@kiilerich.com>
parents:
14186
diff
changeset
|
341 Test remote paths with spaces (issue2983): |
d8fa35c28335
ssh: quote remote paths (issue2983)
Mads Kiilerich <mads@kiilerich.com>
parents:
14186
diff
changeset
|
342 |
34118
72f051f9a7d8
tests: quote $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
34069
diff
changeset
|
343 $ hg init --ssh "\"$PYTHON\" \"$TESTDIR/dummyssh\"" "ssh://user@dummy/a repo" |
17261
e432fb4b4221
tag: don't allow tagging the null revision (issue1915)
Brad Hall <bhall@fb.com>
parents:
17081
diff
changeset
|
344 $ touch "$TESTTMP/a repo/test" |
e432fb4b4221
tag: don't allow tagging the null revision (issue1915)
Brad Hall <bhall@fb.com>
parents:
17081
diff
changeset
|
345 $ hg -R 'a repo' commit -A -m "test" |
e432fb4b4221
tag: don't allow tagging the null revision (issue1915)
Brad Hall <bhall@fb.com>
parents:
17081
diff
changeset
|
346 adding test |
15581
d8fa35c28335
ssh: quote remote paths (issue2983)
Mads Kiilerich <mads@kiilerich.com>
parents:
14186
diff
changeset
|
347 $ hg -R 'a repo' tag tag |
34118
72f051f9a7d8
tests: quote $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
34069
diff
changeset
|
348 $ hg id --ssh "\"$PYTHON\" \"$TESTDIR/dummyssh\"" "ssh://user@dummy/a repo" |
17261
e432fb4b4221
tag: don't allow tagging the null revision (issue1915)
Brad Hall <bhall@fb.com>
parents:
17081
diff
changeset
|
349 73649e48688a |
15581
d8fa35c28335
ssh: quote remote paths (issue2983)
Mads Kiilerich <mads@kiilerich.com>
parents:
14186
diff
changeset
|
350 |
34118
72f051f9a7d8
tests: quote $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
34069
diff
changeset
|
351 $ 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
|
352 abort: unknown revision 'noNoNO'! |
d36440d84328
httppeer: reintroduce _abort that accidentally was removed in 167047ba3cfa
Mads Kiilerich <madski@unity3d.com>
parents:
20501
diff
changeset
|
353 [255] |
d36440d84328
httppeer: reintroduce _abort that accidentally was removed in 167047ba3cfa
Mads Kiilerich <madski@unity3d.com>
parents:
20501
diff
changeset
|
354 |
17844
b32e55e6c3c7
clone: don't %-escape the default destination (issue3145)
Matt Mackall <mpm@selenic.com>
parents:
17298
diff
changeset
|
355 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
|
356 |
34118
72f051f9a7d8
tests: quote $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
34069
diff
changeset
|
357 $ 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
|
358 destination directory: a repo |
b32e55e6c3c7
clone: don't %-escape the default destination (issue3145)
Matt Mackall <mpm@selenic.com>
parents:
17298
diff
changeset
|
359 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
|
360 [255] |
b32e55e6c3c7
clone: don't %-escape the default destination (issue3145)
Matt Mackall <mpm@selenic.com>
parents:
17298
diff
changeset
|
361 |
32829
77eaf9539499
dispatch: protect against malicious 'hg serve --stdio' invocations (sec)
Augie Fackler <augie@google.com>
parents:
31693
diff
changeset
|
362 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:
31693
diff
changeset
|
363 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:
31693
diff
changeset
|
364 $ hg -R --debugger serve --stdio |
77eaf9539499
dispatch: protect against malicious 'hg serve --stdio' invocations (sec)
Augie Fackler <augie@google.com>
parents:
31693
diff
changeset
|
365 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:
31693
diff
changeset
|
366 [255] |
77eaf9539499
dispatch: protect against malicious 'hg serve --stdio' invocations (sec)
Augie Fackler <augie@google.com>
parents:
31693
diff
changeset
|
367 $ hg -R --config=ui.debugger=yes serve --stdio |
77eaf9539499
dispatch: protect against malicious 'hg serve --stdio' invocations (sec)
Augie Fackler <augie@google.com>
parents:
31693
diff
changeset
|
368 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:
31693
diff
changeset
|
369 [255] |
77eaf9539499
dispatch: protect against malicious 'hg serve --stdio' invocations (sec)
Augie Fackler <augie@google.com>
parents:
31693
diff
changeset
|
370 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:
31693
diff
changeset
|
371 $ hg -R narf serv --stdio |
77eaf9539499
dispatch: protect against malicious 'hg serve --stdio' invocations (sec)
Augie Fackler <augie@google.com>
parents:
31693
diff
changeset
|
372 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:
31693
diff
changeset
|
373 [255] |
77eaf9539499
dispatch: protect against malicious 'hg serve --stdio' invocations (sec)
Augie Fackler <augie@google.com>
parents:
31693
diff
changeset
|
374 |
16613
289fdcd4cb47
tests: improve test of hg-ssh and make the test pass on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
16611
diff
changeset
|
375 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:
16611
diff
changeset
|
376 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:
16611
diff
changeset
|
377 parameters: |
15897
cc021114fc98
hg-ssh: use shlex for shell-like parsing of SSH_ORIGINAL_COMMAND
Mads Kiilerich <mads@kiilerich.com>
parents:
15648
diff
changeset
|
378 |
16613
289fdcd4cb47
tests: improve test of hg-ssh and make the test pass on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
16611
diff
changeset
|
379 $ cat > ssh.sh << EOF |
289fdcd4cb47
tests: improve test of hg-ssh and make the test pass on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
16611
diff
changeset
|
380 > userhost="\$1" |
289fdcd4cb47
tests: improve test of hg-ssh and make the test pass on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
16611
diff
changeset
|
381 > SSH_ORIGINAL_COMMAND="\$2" |
289fdcd4cb47
tests: improve test of hg-ssh and make the test pass on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
16611
diff
changeset
|
382 > export SSH_ORIGINAL_COMMAND |
289fdcd4cb47
tests: improve test of hg-ssh and make the test pass on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
16611
diff
changeset
|
383 > PYTHONPATH="$PYTHONPATH" |
289fdcd4cb47
tests: improve test of hg-ssh and make the test pass on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
16611
diff
changeset
|
384 > export PYTHONPATH |
34118
72f051f9a7d8
tests: quote $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
34069
diff
changeset
|
385 > "$PYTHON" "$TESTDIR/../contrib/hg-ssh" "$TESTTMP/a repo" |
16613
289fdcd4cb47
tests: improve test of hg-ssh and make the test pass on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
16611
diff
changeset
|
386 > EOF |
289fdcd4cb47
tests: improve test of hg-ssh and make the test pass on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
16611
diff
changeset
|
387 |
289fdcd4cb47
tests: improve test of hg-ssh and make the test pass on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
16611
diff
changeset
|
388 $ hg id --ssh "sh ssh.sh" "ssh://user@dummy/a repo" |
17261
e432fb4b4221
tag: don't allow tagging the null revision (issue1915)
Brad Hall <bhall@fb.com>
parents:
17081
diff
changeset
|
389 73649e48688a |
16611
19379226dc67
hg-ssh: use %s for printing paths in error messages
Mads Kiilerich <mads@kiilerich.com>
parents:
16541
diff
changeset
|
390 |
16613
289fdcd4cb47
tests: improve test of hg-ssh and make the test pass on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
16611
diff
changeset
|
391 $ hg id --ssh "sh ssh.sh" "ssh://user@dummy/a'repo" |
36176
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
36051
diff
changeset
|
392 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
|
393 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
|
394 [255] |
16611
19379226dc67
hg-ssh: use %s for printing paths in error messages
Mads Kiilerich <mads@kiilerich.com>
parents:
16541
diff
changeset
|
395 |
16613
289fdcd4cb47
tests: improve test of hg-ssh and make the test pass on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
16611
diff
changeset
|
396 $ 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:
16611
diff
changeset
|
397 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
|
398 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
|
399 [255] |
cc021114fc98
hg-ssh: use shlex for shell-like parsing of SSH_ORIGINAL_COMMAND
Mads Kiilerich <mads@kiilerich.com>
parents:
15648
diff
changeset
|
400 |
34045
8e6f4939a69a
tests: replace yet more calls to `python` with $PYTHON
Augie Fackler <augie@google.com>
parents:
32833
diff
changeset
|
401 $ SSH_ORIGINAL_COMMAND="'hg' -R 'a'repo' serve --stdio" $PYTHON "$TESTDIR/../contrib/hg-ssh" |
16613
289fdcd4cb47
tests: improve test of hg-ssh and make the test pass on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
16611
diff
changeset
|
402 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:
16611
diff
changeset
|
403 [255] |
289fdcd4cb47
tests: improve test of hg-ssh and make the test pass on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
16611
diff
changeset
|
404 |
16836
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16613
diff
changeset
|
405 Test hg-ssh in read-only mode: |
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16613
diff
changeset
|
406 |
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16613
diff
changeset
|
407 $ cat > ssh.sh << EOF |
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16613
diff
changeset
|
408 > userhost="\$1" |
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16613
diff
changeset
|
409 > SSH_ORIGINAL_COMMAND="\$2" |
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16613
diff
changeset
|
410 > export SSH_ORIGINAL_COMMAND |
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16613
diff
changeset
|
411 > PYTHONPATH="$PYTHONPATH" |
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16613
diff
changeset
|
412 > export PYTHONPATH |
34118
72f051f9a7d8
tests: quote $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
34069
diff
changeset
|
413 > "$PYTHON" "$TESTDIR/../contrib/hg-ssh" --read-only "$TESTTMP/remote" |
16836
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16613
diff
changeset
|
414 > EOF |
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16613
diff
changeset
|
415 |
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16613
diff
changeset
|
416 $ 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:
16613
diff
changeset
|
417 requesting all changes |
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16613
diff
changeset
|
418 adding changesets |
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16613
diff
changeset
|
419 adding manifests |
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16613
diff
changeset
|
420 adding file changes |
23126
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
421 added 6 changesets with 5 changes to 4 files (+1 heads) |
35444
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
35176
diff
changeset
|
422 new changesets 1160648e36ce:1383141674ec |
16836
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16613
diff
changeset
|
423 updating to branch default |
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16613
diff
changeset
|
424 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16613
diff
changeset
|
425 |
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16613
diff
changeset
|
426 $ cd read-only-local |
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16613
diff
changeset
|
427 $ echo "baz" > bar |
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16613
diff
changeset
|
428 $ hg ci -A -m "unpushable commit" bar |
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16613
diff
changeset
|
429 $ hg push --ssh "sh ../ssh.sh" |
16896
2774576dee4d
tests/run-tests: avoid C:/ in arguments
Adrian Buehlmann <adrian@cadifra.com>
parents:
16836
diff
changeset
|
430 pushing to ssh://user@dummy/*/remote (glob) |
16836
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16613
diff
changeset
|
431 searching for changes |
25956
8dc5ee5b7b09
sshpeer: use the doublepipe object for the server to client channel
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25939
diff
changeset
|
432 remote: Permission denied |
27469
58f1645f72c3
bundle2: attribute remote failures to remote (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
27468
diff
changeset
|
433 remote: pretxnopen.hg-ssh hook failed |
58f1645f72c3
bundle2: attribute remote failures to remote (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
27468
diff
changeset
|
434 abort: push failed on remote |
25897
2c14ab597353
test: use bundle2 in test-ssh
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25888
diff
changeset
|
435 [255] |
16836
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16613
diff
changeset
|
436 |
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16613
diff
changeset
|
437 $ cd .. |
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16613
diff
changeset
|
438 |
22247
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
439 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
|
440 |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
441 $ 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
|
442 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
|
443 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
|
444 $ cd stderr-ordering |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
445 $ 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
|
446 > 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
|
447 > |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
448 > 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
|
449 > res = 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
|
450 > repo.ui.write('local stdout\n') |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
451 > return res |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
452 > |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
453 > def extsetup(ui): |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
454 > extensions.wrapfunction(exchange, 'push', wrappedpush) |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
455 > EOF |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
456 |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
457 $ 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
|
458 > [paths] |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
459 > 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
|
460 > [ui] |
34118
72f051f9a7d8
tests: quote $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
34069
diff
changeset
|
461 > 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
|
462 > [extensions] |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
463 > localwrite = localwrite.py |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
464 > EOF |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
465 |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
466 $ echo localwrite > foo |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
467 $ 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
|
468 $ hg push |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
469 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
|
470 searching for changes |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
471 remote: adding changesets |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
472 remote: adding manifests |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
473 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
|
474 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
|
475 remote: KABOOM |
31143
ad56204f733e
hook: flush stdout before restoring stderr redirection
Yuya Nishihara <yuya@tcha.org>
parents:
31013
diff
changeset
|
476 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
|
477 local stdout |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
478 |
25822
405303df6a2a
ssh: test some no-op pull through ssh with --debug
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25562
diff
changeset
|
479 debug output |
405303df6a2a
ssh: test some no-op pull through ssh with --debug
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25562
diff
changeset
|
480 |
36485
f7ef49e44d7c
sshpeer: add support for request tracing
Boris Feld <boris.feld@octobus.net>
parents:
36267
diff
changeset
|
481 $ hg pull --debug ssh://user@dummy/remote --config devel.debug.peer-request=yes |
25822
405303df6a2a
ssh: test some no-op pull through ssh with --debug
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25562
diff
changeset
|
482 pulling from ssh://user@dummy/remote |
34442
8cb9e921ef8c
ssh: quote parameters using shellquote (SEC)
Jun Wu <quark@fb.com>
parents:
34118
diff
changeset
|
483 running .* ".*/dummyssh" ['"]user@dummy['"] ('|")hg -R remote serve --stdio('|") (re) |
36485
f7ef49e44d7c
sshpeer: add support for request tracing
Boris Feld <boris.feld@octobus.net>
parents:
36267
diff
changeset
|
484 devel-peer-request: hello |
25822
405303df6a2a
ssh: test some no-op pull through ssh with --debug
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25562
diff
changeset
|
485 sending hello command |
36485
f7ef49e44d7c
sshpeer: add support for request tracing
Boris Feld <boris.feld@octobus.net>
parents:
36267
diff
changeset
|
486 devel-peer-request: between |
f7ef49e44d7c
sshpeer: add support for request tracing
Boris Feld <boris.feld@octobus.net>
parents:
36267
diff
changeset
|
487 devel-peer-request: pairs: 81 bytes |
25822
405303df6a2a
ssh: test some no-op pull through ssh with --debug
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25562
diff
changeset
|
488 sending between command |
36042
ad5f2b923b0d
push: include a 'check:bookmarks' part when possible
Boris Feld <boris.feld@octobus.net>
parents:
35963
diff
changeset
|
489 remote: 384 |
36578
1d118f9f4f57
bundle2: always advertise client support for stream parts
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36485
diff
changeset
|
490 remote: capabilities: lookup changegroupsubset branchmap pushkey known getbundle unbundlehash batch streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN |
25822
405303df6a2a
ssh: test some no-op pull through ssh with --debug
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25562
diff
changeset
|
491 remote: 1 |
405303df6a2a
ssh: test some no-op pull through ssh with --debug
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25562
diff
changeset
|
492 query 1; heads |
36485
f7ef49e44d7c
sshpeer: add support for request tracing
Boris Feld <boris.feld@octobus.net>
parents:
36267
diff
changeset
|
493 devel-peer-request: batch |
f7ef49e44d7c
sshpeer: add support for request tracing
Boris Feld <boris.feld@octobus.net>
parents:
36267
diff
changeset
|
494 devel-peer-request: cmds: 141 bytes |
25822
405303df6a2a
ssh: test some no-op pull through ssh with --debug
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25562
diff
changeset
|
495 sending batch command |
405303df6a2a
ssh: test some no-op pull through ssh with --debug
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25562
diff
changeset
|
496 searching for changes |
405303df6a2a
ssh: test some no-op pull through ssh with --debug
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25562
diff
changeset
|
497 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:
25562
diff
changeset
|
498 no changes found |
36485
f7ef49e44d7c
sshpeer: add support for request tracing
Boris Feld <boris.feld@octobus.net>
parents:
36267
diff
changeset
|
499 devel-peer-request: getbundle |
f7ef49e44d7c
sshpeer: add support for request tracing
Boris Feld <boris.feld@octobus.net>
parents:
36267
diff
changeset
|
500 devel-peer-request: bookmarks: 1 bytes |
36578
1d118f9f4f57
bundle2: always advertise client support for stream parts
Gregory Szorc <gregory.szorc@gmail.com>
parents:
36485
diff
changeset
|
501 devel-peer-request: bundlecaps: 247 bytes |
36485
f7ef49e44d7c
sshpeer: add support for request tracing
Boris Feld <boris.feld@octobus.net>
parents:
36267
diff
changeset
|
502 devel-peer-request: cg: 1 bytes |
f7ef49e44d7c
sshpeer: add support for request tracing
Boris Feld <boris.feld@octobus.net>
parents:
36267
diff
changeset
|
503 devel-peer-request: common: 122 bytes |
f7ef49e44d7c
sshpeer: add support for request tracing
Boris Feld <boris.feld@octobus.net>
parents:
36267
diff
changeset
|
504 devel-peer-request: heads: 122 bytes |
f7ef49e44d7c
sshpeer: add support for request tracing
Boris Feld <boris.feld@octobus.net>
parents:
36267
diff
changeset
|
505 devel-peer-request: listkeys: 9 bytes |
f7ef49e44d7c
sshpeer: add support for request tracing
Boris Feld <boris.feld@octobus.net>
parents:
36267
diff
changeset
|
506 devel-peer-request: phases: 1 bytes |
25897
2c14ab597353
test: use bundle2 in test-ssh
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25888
diff
changeset
|
507 sending getbundle command |
2c14ab597353
test: use bundle2 in test-ssh
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25888
diff
changeset
|
508 bundle2-input-bundle: with-transaction |
36051
44b8b5ad30eb
pull: retrieve bookmarks through the binary part when possible
Boris Feld <boris.feld@octobus.net>
parents:
36042
diff
changeset
|
509 bundle2-input-part: "bookmarks" supported |
44b8b5ad30eb
pull: retrieve bookmarks through the binary part when possible
Boris Feld <boris.feld@octobus.net>
parents:
36042
diff
changeset
|
510 bundle2-input-part: total payload size 26 |
25897
2c14ab597353
test: use bundle2 in test-ssh
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25888
diff
changeset
|
511 bundle2-input-part: "listkeys" (params: 1 mandatory) supported |
2c14ab597353
test: use bundle2 in test-ssh
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25888
diff
changeset
|
512 bundle2-input-part: total payload size 45 |
35105
10e162bb9bf5
pull: use 'phase-heads' to retrieve phase information
Boris Feld <boris.feld@octobus.net>
parents:
34442
diff
changeset
|
513 bundle2-input-part: "phase-heads" supported |
10e162bb9bf5
pull: use 'phase-heads' to retrieve phase information
Boris Feld <boris.feld@octobus.net>
parents:
34442
diff
changeset
|
514 bundle2-input-part: total payload size 72 |
36051
44b8b5ad30eb
pull: retrieve bookmarks through the binary part when possible
Boris Feld <boris.feld@octobus.net>
parents:
36042
diff
changeset
|
515 bundle2-input-bundle: 2 parts total |
25897
2c14ab597353
test: use bundle2 in test-ssh
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25888
diff
changeset
|
516 checking for updated bookmarks |
25822
405303df6a2a
ssh: test some no-op pull through ssh with --debug
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25562
diff
changeset
|
517 |
22247
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
518 $ cd .. |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
519 |
12414 | 520 $ cat dummylog |
15622
86fc364ca5f8
sshrepo: don't quote obviously safe strings (issue2983)
Mads Kiilerich <mads@kiilerich.com>
parents:
15581
diff
changeset
|
521 Got arguments 1:user@dummy 2:hg -R nonexistent serve --stdio |
26737
fa6ba7c9600b
test-ssh: remove superfluous triple slashes from absolute path test
Yuya Nishihara <yuya@tcha.org>
parents:
26031
diff
changeset
|
522 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
|
523 Got arguments 1:user@dummy 2:hg -R remote serve --stdio |
23116
2dc6b7917cdf
clone: fix copying bookmarks in uncompressed clones (issue4430)
Durham Goode <durham@fb.com>
parents:
22960
diff
changeset
|
524 Got arguments 1:user@dummy 2:hg -R local-stream serve --stdio |
15622
86fc364ca5f8
sshrepo: don't quote obviously safe strings (issue2983)
Mads Kiilerich <mads@kiilerich.com>
parents:
15581
diff
changeset
|
525 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
|
526 Got arguments 1:user@dummy 2:hg -R remote serve --stdio |
24193
eabe44ec5af5
pull: print "pulling from foo" before accessing the other repo
Thomas Arendsen Hein <thomas@intevation.de>
parents:
23416
diff
changeset
|
527 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
|
528 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
|
529 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
|
530 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
|
531 Got arguments 1:user@dummy 2:hg -R remote serve --stdio |
32526
aff7b32b3c05
hook: add hook name information to external hook
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
32525
diff
changeset
|
532 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
|
533 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
|
534 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
|
535 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
|
536 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
|
537 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
|
538 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
|
539 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
|
540 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
|
541 Got arguments 1:user@dummy 2:hg -R remote serve --stdio |
32526
aff7b32b3c05
hook: add hook name information to external hook
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
32525
diff
changeset
|
542 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
|
543 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
|
544 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
|
545 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
|
546 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
|
547 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
|
548 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
|
549 Got arguments 1:user@dummy 2:hg -R remote serve --stdio |
32526
aff7b32b3c05
hook: add hook name information to external hook
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
32525
diff
changeset
|
550 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 |
25822
405303df6a2a
ssh: test some no-op pull through ssh with --debug
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25562
diff
changeset
|
551 Got arguments 1:user@dummy 2:hg -R remote serve --stdio |
27468
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26738
diff
changeset
|
552 |
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26738
diff
changeset
|
553 remote hook failure is attributed to remote |
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26738
diff
changeset
|
554 |
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26738
diff
changeset
|
555 $ cat > $TESTTMP/failhook << EOF |
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26738
diff
changeset
|
556 > def hook(ui, repo, **kwargs): |
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26738
diff
changeset
|
557 > ui.write('hook failure!\n') |
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26738
diff
changeset
|
558 > ui.flush() |
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26738
diff
changeset
|
559 > return 1 |
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26738
diff
changeset
|
560 > EOF |
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26738
diff
changeset
|
561 |
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26738
diff
changeset
|
562 $ 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:
26738
diff
changeset
|
563 |
34118
72f051f9a7d8
tests: quote $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
34069
diff
changeset
|
564 $ hg -q --config ui.ssh="\"$PYTHON\" $TESTDIR/dummyssh" clone ssh://user@dummy/remote hookout |
27468
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26738
diff
changeset
|
565 $ cd hookout |
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26738
diff
changeset
|
566 $ touch hookfailure |
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26738
diff
changeset
|
567 $ hg -q commit -A -m 'remote hook failure' |
34118
72f051f9a7d8
tests: quote $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
34069
diff
changeset
|
568 $ hg --config ui.ssh="\"$PYTHON\" $TESTDIR/dummyssh" push |
27468
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26738
diff
changeset
|
569 pushing to ssh://user@dummy/remote |
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26738
diff
changeset
|
570 searching for changes |
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26738
diff
changeset
|
571 remote: adding changesets |
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26738
diff
changeset
|
572 remote: adding manifests |
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26738
diff
changeset
|
573 remote: adding file changes |
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26738
diff
changeset
|
574 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:
26738
diff
changeset
|
575 remote: hook failure! |
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26738
diff
changeset
|
576 remote: transaction abort! |
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26738
diff
changeset
|
577 remote: rollback completed |
27469
58f1645f72c3
bundle2: attribute remote failures to remote (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
27468
diff
changeset
|
578 remote: pretxnchangegroup.fail hook failed |
58f1645f72c3
bundle2: attribute remote failures to remote (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
27468
diff
changeset
|
579 abort: push failed on remote |
27468
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26738
diff
changeset
|
580 [255] |
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26738
diff
changeset
|
581 |
31693
f3807a135e43
wireproto: properly report server Abort during 'getbundle'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
31342
diff
changeset
|
582 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:
31342
diff
changeset
|
583 |
f3807a135e43
wireproto: properly report server Abort during 'getbundle'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
31342
diff
changeset
|
584 $ echo morefoo >> ../remote/foo |
f3807a135e43
wireproto: properly report server Abort during 'getbundle'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
31342
diff
changeset
|
585 $ 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:
31342
diff
changeset
|
586 $ cat >> ../remote/.hg/hgrc << EOF |
f3807a135e43
wireproto: properly report server Abort during 'getbundle'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
31342
diff
changeset
|
587 > [extensions] |
f3807a135e43
wireproto: properly report server Abort during 'getbundle'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
31342
diff
changeset
|
588 > crash = ${TESTDIR}/crashgetbundler.py |
f3807a135e43
wireproto: properly report server Abort during 'getbundle'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
31342
diff
changeset
|
589 > EOF |
34118
72f051f9a7d8
tests: quote $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
34069
diff
changeset
|
590 $ hg --config ui.ssh="\"$PYTHON\" $TESTDIR/dummyssh" pull |
31693
f3807a135e43
wireproto: properly report server Abort during 'getbundle'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
31342
diff
changeset
|
591 pulling from ssh://user@dummy/remote |
f3807a135e43
wireproto: properly report server Abort during 'getbundle'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
31342
diff
changeset
|
592 searching for changes |
f3807a135e43
wireproto: properly report server Abort during 'getbundle'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
31342
diff
changeset
|
593 remote: abort: this is an exercise |
f3807a135e43
wireproto: properly report server Abort during 'getbundle'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
31342
diff
changeset
|
594 abort: pull failed on remote |
f3807a135e43
wireproto: properly report server Abort during 'getbundle'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
31342
diff
changeset
|
595 [255] |
35891
8b1c887d52e7
sshpeer: add a configurable hint for the ssh error message
Zuzanna Mroczek <zuza@fb.com>
parents:
35857
diff
changeset
|
596 |
8b1c887d52e7
sshpeer: add a configurable hint for the ssh error message
Zuzanna Mroczek <zuza@fb.com>
parents:
35857
diff
changeset
|
597 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:
35857
diff
changeset
|
598 |
35963
3180ff7f6025
test-ssh: do not actually look up "brokenrepository" by DNS
Yuya Nishihara <yuya@tcha.org>
parents:
35891
diff
changeset
|
599 $ hg pull ssh://brokenrepository -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" |
35891
8b1c887d52e7
sshpeer: add a configurable hint for the ssh error message
Zuzanna Mroczek <zuza@fb.com>
parents:
35857
diff
changeset
|
600 pulling from ssh://brokenrepository/ |
8b1c887d52e7
sshpeer: add a configurable hint for the ssh error message
Zuzanna Mroczek <zuza@fb.com>
parents:
35857
diff
changeset
|
601 abort: no suitable response from remote hg! |
8b1c887d52e7
sshpeer: add a configurable hint for the ssh error message
Zuzanna Mroczek <zuza@fb.com>
parents:
35857
diff
changeset
|
602 [255] |
8b1c887d52e7
sshpeer: add a configurable hint for the ssh error message
Zuzanna Mroczek <zuza@fb.com>
parents:
35857
diff
changeset
|
603 |
8b1c887d52e7
sshpeer: add a configurable hint for the ssh error message
Zuzanna Mroczek <zuza@fb.com>
parents:
35857
diff
changeset
|
604 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:
35857
diff
changeset
|
605 |
35963
3180ff7f6025
test-ssh: do not actually look up "brokenrepository" by DNS
Yuya Nishihara <yuya@tcha.org>
parents:
35891
diff
changeset
|
606 $ 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:
35891
diff
changeset
|
607 > --config ui.ssherrorhint="Please see http://company/internalwiki/ssh.html" |
35891
8b1c887d52e7
sshpeer: add a configurable hint for the ssh error message
Zuzanna Mroczek <zuza@fb.com>
parents:
35857
diff
changeset
|
608 pulling from ssh://brokenrepository/ |
8b1c887d52e7
sshpeer: add a configurable hint for the ssh error message
Zuzanna Mroczek <zuza@fb.com>
parents:
35857
diff
changeset
|
609 abort: no suitable response from remote hg! |
8b1c887d52e7
sshpeer: add a configurable hint for the ssh error message
Zuzanna Mroczek <zuza@fb.com>
parents:
35857
diff
changeset
|
610 (Please see http://company/internalwiki/ssh.html) |
8b1c887d52e7
sshpeer: add a configurable hint for the ssh error message
Zuzanna Mroczek <zuza@fb.com>
parents:
35857
diff
changeset
|
611 [255] |
36219
31d21309635b
sshpeer: allow for additional environment passing to ssh exe
Kostia Balytskyi <ikostia@fb.com>
parents:
36176
diff
changeset
|
612 |
31d21309635b
sshpeer: allow for additional environment passing to ssh exe
Kostia Balytskyi <ikostia@fb.com>
parents:
36176
diff
changeset
|
613 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:
36176
diff
changeset
|
614 $ cat >>dumpenv <<EOF |
31d21309635b
sshpeer: allow for additional environment passing to ssh exe
Kostia Balytskyi <ikostia@fb.com>
parents:
36176
diff
changeset
|
615 > #! /bin/sh |
31d21309635b
sshpeer: allow for additional environment passing to ssh exe
Kostia Balytskyi <ikostia@fb.com>
parents:
36176
diff
changeset
|
616 > echo \$VAR >&2 |
31d21309635b
sshpeer: allow for additional environment passing to ssh exe
Kostia Balytskyi <ikostia@fb.com>
parents:
36176
diff
changeset
|
617 > EOF |
31d21309635b
sshpeer: allow for additional environment passing to ssh exe
Kostia Balytskyi <ikostia@fb.com>
parents:
36176
diff
changeset
|
618 $ chmod +x dumpenv |
36267
1853c8677160
test-ssh: stabilize for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
36219
diff
changeset
|
619 $ hg pull ssh://something --config ui.ssh="sh dumpenv" |
36219
31d21309635b
sshpeer: allow for additional environment passing to ssh exe
Kostia Balytskyi <ikostia@fb.com>
parents:
36176
diff
changeset
|
620 pulling from ssh://something/ |
31d21309635b
sshpeer: allow for additional environment passing to ssh exe
Kostia Balytskyi <ikostia@fb.com>
parents:
36176
diff
changeset
|
621 remote: |
31d21309635b
sshpeer: allow for additional environment passing to ssh exe
Kostia Balytskyi <ikostia@fb.com>
parents:
36176
diff
changeset
|
622 abort: no suitable response from remote hg! |
31d21309635b
sshpeer: allow for additional environment passing to ssh exe
Kostia Balytskyi <ikostia@fb.com>
parents:
36176
diff
changeset
|
623 [255] |
36267
1853c8677160
test-ssh: stabilize for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
36219
diff
changeset
|
624 $ hg pull ssh://something --config ui.ssh="sh dumpenv" --config sshenv.VAR=17 |
36219
31d21309635b
sshpeer: allow for additional environment passing to ssh exe
Kostia Balytskyi <ikostia@fb.com>
parents:
36176
diff
changeset
|
625 pulling from ssh://something/ |
31d21309635b
sshpeer: allow for additional environment passing to ssh exe
Kostia Balytskyi <ikostia@fb.com>
parents:
36176
diff
changeset
|
626 remote: 17 |
31d21309635b
sshpeer: allow for additional environment passing to ssh exe
Kostia Balytskyi <ikostia@fb.com>
parents:
36176
diff
changeset
|
627 abort: no suitable response from remote hg! |
31d21309635b
sshpeer: allow for additional environment passing to ssh exe
Kostia Balytskyi <ikostia@fb.com>
parents:
36176
diff
changeset
|
628 [255] |
31d21309635b
sshpeer: allow for additional environment passing to ssh exe
Kostia Balytskyi <ikostia@fb.com>
parents:
36176
diff
changeset
|
629 |