Mercurial > hg
annotate tests/test-ssh-bundle1.t @ 33491:1adcb594eb6b
bookmarks: use 'applychanges' for bookmark update
There is still some use of 'deletedivergent' bookmark here. They will be taken
care of later. The 'deletedivergent' code needs some rework before fitting in
the new world.
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Mon, 10 Jul 2017 19:40:23 +0200 |
parents | 72f051f9a7d8 |
children | 8cb9e921ef8c |
rev | line source |
---|---|
25375
b08887e723a9
test: copy test-ssh.t to test-ssh-bundle1.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25367
diff
changeset
|
1 This test is a duplicate of 'test-http.t' feel free to factor out |
b08887e723a9
test: copy test-ssh.t to test-ssh-bundle1.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25367
diff
changeset
|
2 parts that are not bundle1/bundle2 specific. |
b08887e723a9
test: copy test-ssh.t to test-ssh-bundle1.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25367
diff
changeset
|
3 |
b08887e723a9
test: copy test-ssh.t to test-ssh-bundle1.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25367
diff
changeset
|
4 $ cat << EOF >> $HGRCPATH |
29686
6e375ba01b04
tests: use 'legacy.exchange' option in various bundle1 tests
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
28549
diff
changeset
|
5 > [devel] |
25375
b08887e723a9
test: copy test-ssh.t to test-ssh-bundle1.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25367
diff
changeset
|
6 > # This test is dedicated to interaction through old bundle |
29686
6e375ba01b04
tests: use 'legacy.exchange' option in various bundle1 tests
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
28549
diff
changeset
|
7 > legacy.exchange = bundle1 |
26930
aa136399b295
test: use generaldelta in 'test-ssh-bundle1.t'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26829
diff
changeset
|
8 > [format] # temporary settings |
aa136399b295
test: use generaldelta in 'test-ssh-bundle1.t'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26829
diff
changeset
|
9 > usegeneraldelta=yes |
25375
b08887e723a9
test: copy test-ssh.t to test-ssh-bundle1.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25367
diff
changeset
|
10 > EOF |
1110 | 11 |
4291
35b2e02367a5
test-ssh: use printenv.py
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3853
diff
changeset
|
12 |
12414 | 13 This test tries to exercise the ssh functionality with a dummy script |
1110 | 14 |
14185
eb297845f90b
tests: fix test-ssh.t after 6bd9778ae749
Mads Kiilerich <mads@kiilerich.com>
parents:
14164
diff
changeset
|
15 creating 'remote' repo |
4298
58517f6eb1ad
test-ssh: avoid a shell script
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4291
diff
changeset
|
16 |
12414 | 17 $ hg init remote |
18 $ cd remote | |
19 $ echo this > foo | |
20 $ echo this > fooO | |
21 $ 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
|
22 |
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
23 insert a closed branch (issue4428) |
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
24 |
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
25 $ hg up null |
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
26 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
|
27 $ hg branch closed |
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
28 marked working directory as branch closed |
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
29 (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
|
30 $ hg ci -mc0 |
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
31 $ hg ci --close-branch -mc1 |
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
32 $ hg up -q default |
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
33 |
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
34 configure for serving |
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
35 |
14185
eb297845f90b
tests: fix test-ssh.t after 6bd9778ae749
Mads Kiilerich <mads@kiilerich.com>
parents:
14164
diff
changeset
|
36 $ 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
|
37 > [server] |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
38 > uncompressed = True |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
39 > |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
40 > [hooks] |
30234
34a5f6c66bc5
tests: invoke printenv.py via sh -c for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
30155
diff
changeset
|
41 > 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
|
42 > EOF |
12414 | 43 $ cd .. |
1110 | 44 |
12414 | 45 repo not found error |
46 | |
33335
72f051f9a7d8
tests: quote $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
33286
diff
changeset
|
47 $ 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:
25495
diff
changeset
|
48 remote: abort: repository nonexistent not found! |
12414 | 49 abort: no suitable response from remote hg! |
50 [255] | |
51 | |
52 non-existent absolute path | |
1110 | 53 |
33335
72f051f9a7d8
tests: quote $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
33286
diff
changeset
|
54 $ 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:
25495
diff
changeset
|
55 remote: abort: repository /$TESTTMP/nonexistent not found! |
12414 | 56 abort: no suitable response from remote hg! |
57 [255] | |
58 | |
59 clone remote via stream | |
1110 | 60 |
33335
72f051f9a7d8
tests: quote $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
33286
diff
changeset
|
61 $ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" --uncompressed ssh://user@dummy/remote local-stream |
12414 | 62 streaming all changes |
30155
b7a966ce89ed
changelog: disable delta chains
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29686
diff
changeset
|
63 4 files to transfer, 602 bytes of data |
b7a966ce89ed
changelog: disable delta chains
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29686
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 |
33335
72f051f9a7d8
tests: quote $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
33286
diff
changeset
|
83 $ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" --uncompressed 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:
29686
diff
changeset
|
85 4 files to transfer, 602 bytes of data |
b7a966ce89ed
changelog: disable delta chains
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29686
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 |
12414 | 97 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
|
98 |
33335
72f051f9a7d8
tests: quote $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
33286
diff
changeset
|
99 $ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote local |
12414 | 100 requesting all changes |
101 adding changesets | |
102 adding manifests | |
103 adding file changes | |
23126
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
104 added 3 changesets with 2 changes to 2 files |
12414 | 105 updating to branch default |
106 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
107 | |
108 verify | |
1110 | 109 |
12414 | 110 $ cd local |
111 $ hg verify | |
112 checking changesets | |
113 checking manifests | |
114 crosschecking files in changesets and manifests | |
115 checking files | |
23126
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
116 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
|
117 $ 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
|
118 > [hooks] |
34a5f6c66bc5
tests: invoke printenv.py via sh -c for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
30155
diff
changeset
|
119 > 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
|
120 > EOF |
1110 | 121 |
12414 | 122 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
|
123 |
12414 | 124 $ hg paths |
125 default = ssh://user@dummy/remote | |
33335
72f051f9a7d8
tests: quote $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
33286
diff
changeset
|
126 $ hg pull -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" |
12414 | 127 pulling from ssh://user@dummy/remote |
128 searching for changes | |
129 no changes found | |
130 | |
24138
eabe44ec5af5
pull: print "pulling from foo" before accessing the other repo
Thomas Arendsen Hein <thomas@intevation.de>
parents:
23416
diff
changeset
|
131 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
|
132 |
33335
72f051f9a7d8
tests: quote $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
33286
diff
changeset
|
133 $ 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
|
134 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:
25495
diff
changeset
|
135 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
|
136 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
|
137 [255] |
eabe44ec5af5
pull: print "pulling from foo" before accessing the other repo
Thomas Arendsen Hein <thomas@intevation.de>
parents:
23416
diff
changeset
|
138 |
12414 | 139 local change |
12409
0eaf7d32a5d8
test-ssh: test absolute paths in SSH URLs
Brodie Rao <brodie@bitheap.org>
parents:
12156
diff
changeset
|
140 |
12414 | 141 $ echo bleah > foo |
142 $ hg ci -m "add" | |
143 | |
144 updating rc | |
145 | |
146 $ echo "default-push = ssh://user@dummy/remote" >> .hg/hgrc | |
147 $ echo "[ui]" >> .hg/hgrc | |
33335
72f051f9a7d8
tests: quote $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
33286
diff
changeset
|
148 $ echo "ssh = \"$PYTHON\" \"$TESTDIR/dummyssh\"" >> .hg/hgrc |
12414 | 149 |
150 find outgoing | |
2612
ffb895f16925
add support for streaming clone.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2439
diff
changeset
|
151 |
12414 | 152 $ hg out ssh://user@dummy/remote |
153 comparing with ssh://user@dummy/remote | |
154 searching for changes | |
23126
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
155 changeset: 3:a28a9d1a809c |
12414 | 156 tag: tip |
23126
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
157 parent: 0:1160648e36ce |
12414 | 158 user: test |
159 date: Thu Jan 01 00:00:00 1970 +0000 | |
160 summary: add | |
161 | |
1110 | 162 |
12414 | 163 find incoming on the remote side |
1110 | 164 |
33335
72f051f9a7d8
tests: quote $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
33286
diff
changeset
|
165 $ hg incoming -R ../remote -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" ssh://user@dummy/local |
12414 | 166 comparing with ssh://user@dummy/local |
167 searching for changes | |
23126
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
168 changeset: 3:a28a9d1a809c |
12414 | 169 tag: tip |
23126
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
170 parent: 0:1160648e36ce |
12414 | 171 user: test |
172 date: Thu Jan 01 00:00:00 1970 +0000 | |
173 summary: add | |
174 | |
1110 | 175 |
12504
f7dd8bffe18c
test-ssh: test absolute path that exists
Brodie Rao <brodie@bitheap.org>
parents:
12489
diff
changeset
|
176 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
|
177 |
33335
72f051f9a7d8
tests: quote $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
33286
diff
changeset
|
178 $ 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
|
179 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
|
180 searching for changes |
23126
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
181 changeset: 3:a28a9d1a809c |
12504
f7dd8bffe18c
test-ssh: test absolute path that exists
Brodie Rao <brodie@bitheap.org>
parents:
12489
diff
changeset
|
182 tag: tip |
23126
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
183 parent: 0:1160648e36ce |
12504
f7dd8bffe18c
test-ssh: test absolute path that exists
Brodie Rao <brodie@bitheap.org>
parents:
12489
diff
changeset
|
184 user: test |
f7dd8bffe18c
test-ssh: test absolute path that exists
Brodie Rao <brodie@bitheap.org>
parents:
12489
diff
changeset
|
185 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
|
186 summary: add |
f7dd8bffe18c
test-ssh: test absolute path that exists
Brodie Rao <brodie@bitheap.org>
parents:
12489
diff
changeset
|
187 |
f7dd8bffe18c
test-ssh: test absolute path that exists
Brodie Rao <brodie@bitheap.org>
parents:
12489
diff
changeset
|
188 |
12414 | 189 push |
1110 | 190 |
12414 | 191 $ hg push |
192 pushing to ssh://user@dummy/remote | |
193 searching for changes | |
194 remote: adding changesets | |
195 remote: adding manifests | |
196 remote: adding file changes | |
197 remote: added 1 changesets with 1 changes to 1 files | |
198 $ cd ../remote | |
199 | |
200 check remote tip | |
1110 | 201 |
12414 | 202 $ hg tip |
23126
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
203 changeset: 3:a28a9d1a809c |
12414 | 204 tag: tip |
23126
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
205 parent: 0:1160648e36ce |
12414 | 206 user: test |
207 date: Thu Jan 01 00:00:00 1970 +0000 | |
208 summary: add | |
209 | |
210 $ hg verify | |
211 checking changesets | |
212 checking manifests | |
213 crosschecking files in changesets and manifests | |
214 checking files | |
23126
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
215 2 files, 4 changesets, 3 total revisions |
12414 | 216 $ hg cat -r tip foo |
217 bleah | |
218 $ echo z > z | |
219 $ hg ci -A -m z z | |
220 created new head | |
1982
70ba0c86da8b
Added test for incoming via ssh.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1933
diff
changeset
|
221 |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
222 test pushkeys and bookmarks |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
223 |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
224 $ cd ../local |
33335
72f051f9a7d8
tests: quote $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
33286
diff
changeset
|
225 $ 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
|
226 bookmarks |
18255
7ca534f31a83
debugpushkey: list keys sorted
Mads Kiilerich <mads at kiilerich.com>
parents:
17844
diff
changeset
|
227 namespaces |
15648
79cc89de5be1
phases: add basic pushkey support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
15622
diff
changeset
|
228 phases |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
229 $ 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
|
230 $ hg out -B |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
231 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
|
232 searching for changed bookmarks |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
233 foo 1160648e36ce |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
234 $ hg push -B foo |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
235 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
|
236 searching for changes |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
237 no changes found |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
238 exporting bookmark foo |
16038
dad96e752079
push: don't treat bookmark as a found change
Matt Mackall <mpm@selenic.com>
parents:
16023
diff
changeset
|
239 [1] |
33335
72f051f9a7d8
tests: quote $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
33286
diff
changeset
|
240 $ 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
|
241 foo 1160648e36cec0054048a7edc4110c6f84fde594 |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
242 $ hg book -f foo |
13050 | 243 $ hg push --traceback |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
244 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
|
245 searching for changes |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
246 no changes found |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
247 updating bookmark foo |
16023
90f8b8dd0326
push: return 1 if no changes found (issue3228)
Matt Mackall <mpm@selenic.com>
parents:
15897
diff
changeset
|
248 [1] |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
249 $ hg book -d foo |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
250 $ hg in -B |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
251 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
|
252 searching for changed bookmarks |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
253 foo a28a9d1a809c |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
254 $ 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
|
255 $ hg pull -B foo |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
256 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
|
257 no changes found |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
258 updating bookmark foo |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
259 $ hg book -d foo |
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
260 $ hg push -B foo |
13368
d4ab9486e514
bookmarks: move push/pull command features to core
Matt Mackall <mpm@selenic.com>
parents:
13050
diff
changeset
|
261 pushing to ssh://user@dummy/remote |
d4ab9486e514
bookmarks: move push/pull command features to core
Matt Mackall <mpm@selenic.com>
parents:
13050
diff
changeset
|
262 searching for changes |
d4ab9486e514
bookmarks: move push/pull command features to core
Matt Mackall <mpm@selenic.com>
parents:
13050
diff
changeset
|
263 no changes found |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
264 deleting remote bookmark foo |
16038
dad96e752079
push: don't treat bookmark as a found change
Matt Mackall <mpm@selenic.com>
parents:
16023
diff
changeset
|
265 [1] |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
266 |
12414 | 267 a bad, evil hook that prints to stdout |
1110 | 268 |
14186
8513bd2e7259
tests: share dummyssh
Mads Kiilerich <mads@kiilerich.com>
parents:
14185
diff
changeset
|
269 $ cat <<EOF > $TESTTMP/badhook |
8513bd2e7259
tests: share dummyssh
Mads Kiilerich <mads@kiilerich.com>
parents:
14185
diff
changeset
|
270 > import sys |
8513bd2e7259
tests: share dummyssh
Mads Kiilerich <mads@kiilerich.com>
parents:
14185
diff
changeset
|
271 > sys.stdout.write("KABOOM\n") |
8513bd2e7259
tests: share dummyssh
Mads Kiilerich <mads@kiilerich.com>
parents:
14185
diff
changeset
|
272 > EOF |
8513bd2e7259
tests: share dummyssh
Mads Kiilerich <mads@kiilerich.com>
parents:
14185
diff
changeset
|
273 |
12969
6bd9778ae749
pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents:
12773
diff
changeset
|
274 $ echo '[hooks]' >> ../remote/.hg/hgrc |
33335
72f051f9a7d8
tests: quote $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
33286
diff
changeset
|
275 $ echo "changegroup.stdout = \"$PYTHON\" $TESTTMP/badhook" >> ../remote/.hg/hgrc |
12414 | 276 $ echo r > r |
277 $ hg ci -A -m z r | |
278 | |
279 push should succeed even though it has an unexpected response | |
1110 | 280 |
12414 | 281 $ hg push |
282 pushing to ssh://user@dummy/remote | |
283 searching for changes | |
20501
8a9e0b523d2d
discovery: improve "note: unsynced remote changes!" warning
Mads Kiilerich <madski@unity3d.com>
parents:
20403
diff
changeset
|
284 remote has heads on branch 'default' that are not known locally: 6c0482d977a3 |
12414 | 285 remote: adding changesets |
286 remote: adding manifests | |
287 remote: adding file changes | |
288 remote: added 1 changesets with 1 changes to 1 files | |
289 remote: KABOOM | |
290 $ hg -R ../remote heads | |
23126
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
291 changeset: 5:1383141674ec |
12414 | 292 tag: tip |
23126
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
293 parent: 3:a28a9d1a809c |
12414 | 294 user: test |
295 date: Thu Jan 01 00:00:00 1970 +0000 | |
296 summary: z | |
297 | |
23126
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
298 changeset: 4:6c0482d977a3 |
12414 | 299 parent: 0:1160648e36ce |
300 user: test | |
301 date: Thu Jan 01 00:00:00 1970 +0000 | |
302 summary: z | |
303 | |
13464
da0ddd62b9d8
sshrepo: catch passwords in ssh urls
Adrian Buehlmann <adrian@cadifra.com>
parents:
13405
diff
changeset
|
304 |
13604
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
305 clone bookmarks |
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
306 |
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
307 $ hg -R ../remote bookmark test |
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
308 $ hg -R ../remote bookmarks |
23126
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
309 * test 4:6c0482d977a3 |
33335
72f051f9a7d8
tests: quote $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
33286
diff
changeset
|
310 $ 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
|
311 requesting all changes |
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
312 adding changesets |
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
313 adding manifests |
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
314 adding file changes |
23126
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
315 added 6 changesets with 5 changes to 4 files (+1 heads) |
13604
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
316 updating to branch default |
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
317 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
|
318 $ hg -R local-bookmarks bookmarks |
23126
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
319 test 4:6c0482d977a3 |
13604
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
320 |
13464
da0ddd62b9d8
sshrepo: catch passwords in ssh urls
Adrian Buehlmann <adrian@cadifra.com>
parents:
13405
diff
changeset
|
321 passwords in ssh urls are not supported |
13755 | 322 (we use a glob here because different Python versions give different |
323 results here) | |
13464
da0ddd62b9d8
sshrepo: catch passwords in ssh urls
Adrian Buehlmann <adrian@cadifra.com>
parents:
13405
diff
changeset
|
324 |
da0ddd62b9d8
sshrepo: catch passwords in ssh urls
Adrian Buehlmann <adrian@cadifra.com>
parents:
13405
diff
changeset
|
325 $ hg push ssh://user:erroneouspwd@dummy/remote |
13755 | 326 pushing to ssh://user:*@dummy/remote (glob) |
13464
da0ddd62b9d8
sshrepo: catch passwords in ssh urls
Adrian Buehlmann <adrian@cadifra.com>
parents:
13405
diff
changeset
|
327 abort: password in URL not supported! |
da0ddd62b9d8
sshrepo: catch passwords in ssh urls
Adrian Buehlmann <adrian@cadifra.com>
parents:
13405
diff
changeset
|
328 [255] |
da0ddd62b9d8
sshrepo: catch passwords in ssh urls
Adrian Buehlmann <adrian@cadifra.com>
parents:
13405
diff
changeset
|
329 |
12414 | 330 $ cd .. |
15581
d8fa35c28335
ssh: quote remote paths (issue2983)
Mads Kiilerich <mads@kiilerich.com>
parents:
14186
diff
changeset
|
331 |
17015
73d20de5f30b
tests: add missing no-outer-repo requirements
Mads Kiilerich <mads@kiilerich.com>
parents:
16982
diff
changeset
|
332 hide outer repo |
73d20de5f30b
tests: add missing no-outer-repo requirements
Mads Kiilerich <mads@kiilerich.com>
parents:
16982
diff
changeset
|
333 $ hg init |
73d20de5f30b
tests: add missing no-outer-repo requirements
Mads Kiilerich <mads@kiilerich.com>
parents:
16982
diff
changeset
|
334 |
15581
d8fa35c28335
ssh: quote remote paths (issue2983)
Mads Kiilerich <mads@kiilerich.com>
parents:
14186
diff
changeset
|
335 Test remote paths with spaces (issue2983): |
d8fa35c28335
ssh: quote remote paths (issue2983)
Mads Kiilerich <mads@kiilerich.com>
parents:
14186
diff
changeset
|
336 |
33335
72f051f9a7d8
tests: quote $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
33286
diff
changeset
|
337 $ 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
|
338 $ touch "$TESTTMP/a repo/test" |
e432fb4b4221
tag: don't allow tagging the null revision (issue1915)
Brad Hall <bhall@fb.com>
parents:
17075
diff
changeset
|
339 $ 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
|
340 adding test |
15581
d8fa35c28335
ssh: quote remote paths (issue2983)
Mads Kiilerich <mads@kiilerich.com>
parents:
14186
diff
changeset
|
341 $ hg -R 'a repo' tag tag |
33335
72f051f9a7d8
tests: quote $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
33286
diff
changeset
|
342 $ 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
|
343 73649e48688a |
15581
d8fa35c28335
ssh: quote remote paths (issue2983)
Mads Kiilerich <mads@kiilerich.com>
parents:
14186
diff
changeset
|
344 |
33335
72f051f9a7d8
tests: quote $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
33286
diff
changeset
|
345 $ 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
|
346 abort: unknown revision 'noNoNO'! |
d36440d84328
httppeer: reintroduce _abort that accidentally was removed in 167047ba3cfa
Mads Kiilerich <madski@unity3d.com>
parents:
20501
diff
changeset
|
347 [255] |
d36440d84328
httppeer: reintroduce _abort that accidentally was removed in 167047ba3cfa
Mads Kiilerich <madski@unity3d.com>
parents:
20501
diff
changeset
|
348 |
17844
b32e55e6c3c7
clone: don't %-escape the default destination (issue3145)
Matt Mackall <mpm@selenic.com>
parents:
17298
diff
changeset
|
349 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
|
350 |
33335
72f051f9a7d8
tests: quote $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
33286
diff
changeset
|
351 $ 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
|
352 destination directory: a repo |
b32e55e6c3c7
clone: don't %-escape the default destination (issue3145)
Matt Mackall <mpm@selenic.com>
parents:
17298
diff
changeset
|
353 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
|
354 [255] |
b32e55e6c3c7
clone: don't %-escape the default destination (issue3145)
Matt Mackall <mpm@selenic.com>
parents:
17298
diff
changeset
|
355 |
16608
289fdcd4cb47
tests: improve test of hg-ssh and make the test pass on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
16606
diff
changeset
|
356 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
|
357 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
|
358 parameters: |
15897
cc021114fc98
hg-ssh: use shlex for shell-like parsing of SSH_ORIGINAL_COMMAND
Mads Kiilerich <mads@kiilerich.com>
parents:
15648
diff
changeset
|
359 |
16608
289fdcd4cb47
tests: improve test of hg-ssh and make the test pass on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
16606
diff
changeset
|
360 $ 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
|
361 > 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
|
362 > 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
|
363 > 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
|
364 > 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
|
365 > export PYTHONPATH |
33335
72f051f9a7d8
tests: quote $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
33286
diff
changeset
|
366 > "$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
|
367 > EOF |
289fdcd4cb47
tests: improve test of hg-ssh and make the test pass on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
16606
diff
changeset
|
368 |
289fdcd4cb47
tests: improve test of hg-ssh and make the test pass on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
16606
diff
changeset
|
369 $ 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
|
370 73649e48688a |
16606
19379226dc67
hg-ssh: use %s for printing paths in error messages
Mads Kiilerich <mads@kiilerich.com>
parents:
16541
diff
changeset
|
371 |
16608
289fdcd4cb47
tests: improve test of hg-ssh and make the test pass on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
16606
diff
changeset
|
372 $ hg id --ssh "sh ssh.sh" "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
|
373 remote: Illegal repository "$TESTTMP/a'repo" (glob) |
15897
cc021114fc98
hg-ssh: use shlex for shell-like parsing of SSH_ORIGINAL_COMMAND
Mads Kiilerich <mads@kiilerich.com>
parents:
15648
diff
changeset
|
374 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
|
375 [255] |
16606
19379226dc67
hg-ssh: use %s for printing paths in error messages
Mads Kiilerich <mads@kiilerich.com>
parents:
16541
diff
changeset
|
376 |
16608
289fdcd4cb47
tests: improve test of hg-ssh and make the test pass on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
16606
diff
changeset
|
377 $ 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
|
378 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
|
379 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
|
380 [255] |
cc021114fc98
hg-ssh: use shlex for shell-like parsing of SSH_ORIGINAL_COMMAND
Mads Kiilerich <mads@kiilerich.com>
parents:
15648
diff
changeset
|
381 |
33262
8e6f4939a69a
tests: replace yet more calls to `python` with $PYTHON
Augie Fackler <augie@google.com>
parents:
31747
diff
changeset
|
382 $ SSH_ORIGINAL_COMMAND="'hg' serve -R 'a'repo' --stdio" $PYTHON "$TESTDIR/../contrib/hg-ssh" |
28549 | 383 Illegal command "'hg' serve -R 'a'repo' --stdio": No closing quotation |
16608
289fdcd4cb47
tests: improve test of hg-ssh and make the test pass on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
16606
diff
changeset
|
384 [255] |
289fdcd4cb47
tests: improve test of hg-ssh and make the test pass on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
16606
diff
changeset
|
385 |
16836
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16608
diff
changeset
|
386 Test hg-ssh in read-only mode: |
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16608
diff
changeset
|
387 |
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16608
diff
changeset
|
388 $ cat > ssh.sh << EOF |
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16608
diff
changeset
|
389 > userhost="\$1" |
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16608
diff
changeset
|
390 > SSH_ORIGINAL_COMMAND="\$2" |
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16608
diff
changeset
|
391 > export SSH_ORIGINAL_COMMAND |
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16608
diff
changeset
|
392 > PYTHONPATH="$PYTHONPATH" |
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16608
diff
changeset
|
393 > export PYTHONPATH |
33335
72f051f9a7d8
tests: quote $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
33286
diff
changeset
|
394 > "$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
|
395 > EOF |
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16608
diff
changeset
|
396 |
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16608
diff
changeset
|
397 $ 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
|
398 requesting all changes |
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16608
diff
changeset
|
399 adding changesets |
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16608
diff
changeset
|
400 adding manifests |
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16608
diff
changeset
|
401 adding file changes |
23126
8b4a8a9176e2
clone: properly mark branches closed with --uncompressed (issue4428)
Matt Mackall <mpm@selenic.com>
parents:
23116
diff
changeset
|
402 added 6 changesets with 5 changes to 4 files (+1 heads) |
16836
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16608
diff
changeset
|
403 updating to branch default |
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16608
diff
changeset
|
404 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
|
405 |
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16608
diff
changeset
|
406 $ cd read-only-local |
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16608
diff
changeset
|
407 $ echo "baz" > bar |
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16608
diff
changeset
|
408 $ hg ci -A -m "unpushable commit" bar |
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16608
diff
changeset
|
409 $ hg push --ssh "sh ../ssh.sh" |
16897
2774576dee4d
tests/run-tests: avoid C:/ in arguments
Adrian Buehlmann <adrian@cadifra.com>
parents:
16836
diff
changeset
|
410 pushing to ssh://user@dummy/*/remote (glob) |
16836
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16608
diff
changeset
|
411 searching for changes |
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16608
diff
changeset
|
412 remote: Permission denied |
25127
2b9cda9040f7
hg-ssh: reject push earlier (on pretxnopen)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24740
diff
changeset
|
413 remote: abort: pretxnopen.hg-ssh hook failed |
16836
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16608
diff
changeset
|
414 remote: Permission denied |
23416
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23126
diff
changeset
|
415 remote: pushkey-abort: prepushkey.hg-ssh hook failed |
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23126
diff
changeset
|
416 updating 6c0482d977a3 to public failed! |
53a65929ef1f
pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23126
diff
changeset
|
417 [1] |
16836
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16608
diff
changeset
|
418 |
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16608
diff
changeset
|
419 $ cd .. |
1ba3e17186c8
hg-ssh: read-only flag
David Schleimer <dschleimer@fb.com>
parents:
16608
diff
changeset
|
420 |
22247
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
421 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
|
422 |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
423 $ 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
|
424 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
|
425 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
|
426 $ cd stderr-ordering |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
427 $ 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
|
428 > 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
|
429 > |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
430 > 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
|
431 > 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
|
432 > 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
|
433 > return res |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
434 > |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
435 > def extsetup(ui): |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
436 > 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
|
437 > EOF |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
438 |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
439 $ 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
|
440 > [paths] |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
441 > 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
|
442 > [ui] |
33335
72f051f9a7d8
tests: quote $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
33286
diff
changeset
|
443 > 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
|
444 > [extensions] |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
445 > localwrite = localwrite.py |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
446 > EOF |
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 $ echo localwrite > foo |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
449 $ 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
|
450 $ hg push |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
451 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
|
452 searching for changes |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
453 remote: adding changesets |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
454 remote: adding manifests |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
455 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
|
456 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
|
457 remote: KABOOM |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
458 local stdout |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
459 |
25338
405303df6a2a
ssh: test some no-op pull through ssh with --debug
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25127
diff
changeset
|
460 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
|
461 |
405303df6a2a
ssh: test some no-op pull through ssh with --debug
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25127
diff
changeset
|
462 $ hg pull --debug ssh://user@dummy/remote |
405303df6a2a
ssh: test some no-op pull through ssh with --debug
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25127
diff
changeset
|
463 pulling from ssh://user@dummy/remote |
33262
8e6f4939a69a
tests: replace yet more calls to `python` with $PYTHON
Augie Fackler <augie@google.com>
parents:
31747
diff
changeset
|
464 running .* ".*/dummyssh" user@dummy ('|")hg -R remote serve --stdio('|") (re) |
25338
405303df6a2a
ssh: test some no-op pull through ssh with --debug
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25127
diff
changeset
|
465 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
|
466 sending between command |
30563
e118233172fe
wireproto: only advertise HTTP-specific capabilities to HTTP peers (BC)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30234
diff
changeset
|
467 remote: 355 |
e118233172fe
wireproto: only advertise HTTP-specific capabilities to HTTP peers (BC)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30234
diff
changeset
|
468 remote: capabilities: lookup changegroupsubset branchmap pushkey known getbundle unbundlehash batch streamreqs=generaldelta,revlogv1 bundle2=HG20%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps unbundle=HG10GZ,HG10BZ,HG10UN |
25338
405303df6a2a
ssh: test some no-op pull through ssh with --debug
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25127
diff
changeset
|
469 remote: 1 |
405303df6a2a
ssh: test some no-op pull through ssh with --debug
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25127
diff
changeset
|
470 preparing listkeys for "bookmarks" |
405303df6a2a
ssh: test some no-op pull through ssh with --debug
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25127
diff
changeset
|
471 sending listkeys command |
25339
c50655b9c856
listkey: display the size of the listkey payload in a debug message
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25338
diff
changeset
|
472 received listkey for "bookmarks": 45 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
|
473 query 1; heads |
405303df6a2a
ssh: test some no-op pull through ssh with --debug
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25127
diff
changeset
|
474 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
|
475 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
|
476 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
|
477 no changes found |
405303df6a2a
ssh: test some no-op pull through ssh with --debug
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25127
diff
changeset
|
478 preparing listkeys for "phases" |
405303df6a2a
ssh: test some no-op pull through ssh with --debug
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25127
diff
changeset
|
479 sending listkeys command |
25339
c50655b9c856
listkey: display the size of the listkey payload in a debug message
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25338
diff
changeset
|
480 received listkey for "phases": 15 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
|
481 checking for updated bookmarks |
405303df6a2a
ssh: test some no-op pull through ssh with --debug
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25127
diff
changeset
|
482 |
22247
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
483 $ cd .. |
8341c677c204
test-ssh: verify that stderr from remote is printed (issue4336)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
21188
diff
changeset
|
484 |
12414 | 485 $ cat dummylog |
15622
86fc364ca5f8
sshrepo: don't quote obviously safe strings (issue2983)
Mads Kiilerich <mads@kiilerich.com>
parents:
15581
diff
changeset
|
486 Got arguments 1:user@dummy 2:hg -R nonexistent serve --stdio |
86fc364ca5f8
sshrepo: don't quote obviously safe strings (issue2983)
Mads Kiilerich <mads@kiilerich.com>
parents:
15581
diff
changeset
|
487 Got arguments 1:user@dummy 2:hg -R /$TESTTMP/nonexistent serve --stdio |
86fc364ca5f8
sshrepo: don't quote obviously safe strings (issue2983)
Mads Kiilerich <mads@kiilerich.com>
parents:
15581
diff
changeset
|
488 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
|
489 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
|
490 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
|
491 Got arguments 1:user@dummy 2:hg -R remote serve --stdio |
24138
eabe44ec5af5
pull: print "pulling from foo" before accessing the other repo
Thomas Arendsen Hein <thomas@intevation.de>
parents:
23416
diff
changeset
|
492 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
|
493 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
|
494 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
|
495 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
|
496 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
|
497 changegroup-in-remote hook: 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
|
498 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
|
499 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
|
500 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
|
501 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
|
502 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
|
503 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
|
504 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
|
505 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
|
506 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
|
507 changegroup-in-remote hook: 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
|
508 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
|
509 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
|
510 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
|
511 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
|
512 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
|
513 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
|
514 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
|
515 changegroup-in-remote hook: 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
|
516 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
|
517 |
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
518 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
|
519 |
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
520 $ cat > $TESTTMP/failhook << EOF |
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
521 > def hook(ui, repo, **kwargs): |
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
522 > ui.write('hook failure!\n') |
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
523 > ui.flush() |
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
524 > return 1 |
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
525 > EOF |
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
526 |
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
527 $ 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
|
528 |
33335
72f051f9a7d8
tests: quote $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
33286
diff
changeset
|
529 $ 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
|
530 $ cd hookout |
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
531 $ touch hookfailure |
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
532 $ 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
|
533 $ 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
|
534 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
|
535 searching for changes |
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
536 remote: adding changesets |
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
537 remote: adding manifests |
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
538 remote: adding file changes |
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
539 remote: added 1 changesets with 1 changes to 1 files |
26829
58f1645f72c3
bundle2: attribute remote failures to remote (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26828
diff
changeset
|
540 remote: hook failure! |
58f1645f72c3
bundle2: attribute remote failures to remote (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26828
diff
changeset
|
541 remote: transaction abort! |
26828
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
542 remote: rollback completed |
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
543 remote: abort: pretxnchangegroup.fail hook failed |
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
544 [1] |
00e75baa810f
tests: add tests for remote hook output (issue4788)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26142
diff
changeset
|
545 |
30914
f3807a135e43
wireproto: properly report server Abort during 'getbundle'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30563
diff
changeset
|
546 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
|
547 |
f3807a135e43
wireproto: properly report server Abort during 'getbundle'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30563
diff
changeset
|
548 $ 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
|
549 $ 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
|
550 $ 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
|
551 > [extensions] |
f3807a135e43
wireproto: properly report server Abort during 'getbundle'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30563
diff
changeset
|
552 > 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
|
553 > EOF |
33335
72f051f9a7d8
tests: quote $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
33286
diff
changeset
|
554 $ 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
|
555 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
|
556 searching for changes |
f3807a135e43
wireproto: properly report server Abort during 'getbundle'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30563
diff
changeset
|
557 adding changesets |
f3807a135e43
wireproto: properly report server Abort during 'getbundle'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30563
diff
changeset
|
558 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
|
559 transaction abort! |
f3807a135e43
wireproto: properly report server Abort during 'getbundle'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30563
diff
changeset
|
560 rollback completed |
f3807a135e43
wireproto: properly report server Abort during 'getbundle'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30563
diff
changeset
|
561 abort: stream ended unexpectedly (got 0 bytes, expected 4) |
f3807a135e43
wireproto: properly report server Abort during 'getbundle'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30563
diff
changeset
|
562 [255] |