##// END OF EJS Templates
test: pull through http when testing for race conditions...
Pierre-Yves David -
r25442:9ee395df default
parent child Browse files
Show More
@@ -1,754 +1,770 b''
1 #require serve
1 #require serve
2
2
3 $ cat << EOF >> $HGRCPATH
3 $ cat << EOF >> $HGRCPATH
4 > [ui]
4 > [ui]
5 > logtemplate={rev}:{node|short} {desc|firstline}
5 > logtemplate={rev}:{node|short} {desc|firstline}
6 > [phases]
6 > [phases]
7 > publish=False
7 > publish=False
8 > [experimental]
8 > [experimental]
9 > evolution=createmarkers,exchange
9 > evolution=createmarkers,exchange
10 > # drop me once bundle2 is the default,
10 > # drop me once bundle2 is the default,
11 > # added to get test change early.
11 > # added to get test change early.
12 > bundle2-exp = True
12 > bundle2-exp = True
13 > EOF
13 > EOF
14
14
15 initialize
15 initialize
16
16
17 $ hg init a
17 $ hg init a
18 $ cd a
18 $ cd a
19 $ echo 'test' > test
19 $ echo 'test' > test
20 $ hg commit -Am'test'
20 $ hg commit -Am'test'
21 adding test
21 adding test
22
22
23 set bookmarks
23 set bookmarks
24
24
25 $ hg bookmark X
25 $ hg bookmark X
26 $ hg bookmark Y
26 $ hg bookmark Y
27 $ hg bookmark Z
27 $ hg bookmark Z
28
28
29 import bookmark by name
29 import bookmark by name
30
30
31 $ hg init ../b
31 $ hg init ../b
32 $ cd ../b
32 $ cd ../b
33 $ hg book Y
33 $ hg book Y
34 $ hg book
34 $ hg book
35 * Y -1:000000000000
35 * Y -1:000000000000
36 $ hg pull ../a
36 $ hg pull ../a
37 pulling from ../a
37 pulling from ../a
38 requesting all changes
38 requesting all changes
39 adding changesets
39 adding changesets
40 adding manifests
40 adding manifests
41 adding file changes
41 adding file changes
42 added 1 changesets with 1 changes to 1 files
42 added 1 changesets with 1 changes to 1 files
43 adding remote bookmark X
43 adding remote bookmark X
44 updating bookmark Y
44 updating bookmark Y
45 adding remote bookmark Z
45 adding remote bookmark Z
46 (run 'hg update' to get a working copy)
46 (run 'hg update' to get a working copy)
47 $ hg bookmarks
47 $ hg bookmarks
48 X 0:4e3505fd9583
48 X 0:4e3505fd9583
49 * Y 0:4e3505fd9583
49 * Y 0:4e3505fd9583
50 Z 0:4e3505fd9583
50 Z 0:4e3505fd9583
51 $ hg debugpushkey ../a namespaces
51 $ hg debugpushkey ../a namespaces
52 bookmarks
52 bookmarks
53 namespaces
53 namespaces
54 obsolete
54 obsolete
55 phases
55 phases
56 $ hg debugpushkey ../a bookmarks
56 $ hg debugpushkey ../a bookmarks
57 X 4e3505fd95835d721066b76e75dbb8cc554d7f77
57 X 4e3505fd95835d721066b76e75dbb8cc554d7f77
58 Y 4e3505fd95835d721066b76e75dbb8cc554d7f77
58 Y 4e3505fd95835d721066b76e75dbb8cc554d7f77
59 Z 4e3505fd95835d721066b76e75dbb8cc554d7f77
59 Z 4e3505fd95835d721066b76e75dbb8cc554d7f77
60
60
61 delete the bookmark to re-pull it
61 delete the bookmark to re-pull it
62
62
63 $ hg book -d X
63 $ hg book -d X
64 $ hg pull -B X ../a
64 $ hg pull -B X ../a
65 pulling from ../a
65 pulling from ../a
66 no changes found
66 no changes found
67 adding remote bookmark X
67 adding remote bookmark X
68
68
69 finally no-op pull
69 finally no-op pull
70
70
71 $ hg pull -B X ../a
71 $ hg pull -B X ../a
72 pulling from ../a
72 pulling from ../a
73 no changes found
73 no changes found
74 $ hg bookmark
74 $ hg bookmark
75 X 0:4e3505fd9583
75 X 0:4e3505fd9583
76 * Y 0:4e3505fd9583
76 * Y 0:4e3505fd9583
77 Z 0:4e3505fd9583
77 Z 0:4e3505fd9583
78
78
79 export bookmark by name
79 export bookmark by name
80
80
81 $ hg bookmark W
81 $ hg bookmark W
82 $ hg bookmark foo
82 $ hg bookmark foo
83 $ hg bookmark foobar
83 $ hg bookmark foobar
84 $ hg push -B W ../a
84 $ hg push -B W ../a
85 pushing to ../a
85 pushing to ../a
86 searching for changes
86 searching for changes
87 no changes found
87 no changes found
88 exporting bookmark W
88 exporting bookmark W
89 [1]
89 [1]
90 $ hg -R ../a bookmarks
90 $ hg -R ../a bookmarks
91 W -1:000000000000
91 W -1:000000000000
92 X 0:4e3505fd9583
92 X 0:4e3505fd9583
93 Y 0:4e3505fd9583
93 Y 0:4e3505fd9583
94 * Z 0:4e3505fd9583
94 * Z 0:4e3505fd9583
95
95
96 delete a remote bookmark
96 delete a remote bookmark
97
97
98 $ hg book -d W
98 $ hg book -d W
99 $ hg push -B W ../a
99 $ hg push -B W ../a
100 pushing to ../a
100 pushing to ../a
101 searching for changes
101 searching for changes
102 no changes found
102 no changes found
103 deleting remote bookmark W
103 deleting remote bookmark W
104 [1]
104 [1]
105
105
106 push/pull name that doesn't exist
106 push/pull name that doesn't exist
107
107
108 $ hg push -B badname ../a
108 $ hg push -B badname ../a
109 pushing to ../a
109 pushing to ../a
110 searching for changes
110 searching for changes
111 bookmark badname does not exist on the local or remote repository!
111 bookmark badname does not exist on the local or remote repository!
112 no changes found
112 no changes found
113 [2]
113 [2]
114 $ hg pull -B anotherbadname ../a
114 $ hg pull -B anotherbadname ../a
115 pulling from ../a
115 pulling from ../a
116 abort: remote bookmark anotherbadname not found!
116 abort: remote bookmark anotherbadname not found!
117 [255]
117 [255]
118
118
119 divergent bookmarks
119 divergent bookmarks
120
120
121 $ cd ../a
121 $ cd ../a
122 $ echo c1 > f1
122 $ echo c1 > f1
123 $ hg ci -Am1
123 $ hg ci -Am1
124 adding f1
124 adding f1
125 $ hg book -f @
125 $ hg book -f @
126 $ hg book -f X
126 $ hg book -f X
127 $ hg book
127 $ hg book
128 @ 1:0d2164f0ce0d
128 @ 1:0d2164f0ce0d
129 * X 1:0d2164f0ce0d
129 * X 1:0d2164f0ce0d
130 Y 0:4e3505fd9583
130 Y 0:4e3505fd9583
131 Z 1:0d2164f0ce0d
131 Z 1:0d2164f0ce0d
132
132
133 $ cd ../b
133 $ cd ../b
134 $ hg up
134 $ hg up
135 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
135 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
136 updating bookmark foobar
136 updating bookmark foobar
137 $ echo c2 > f2
137 $ echo c2 > f2
138 $ hg ci -Am2
138 $ hg ci -Am2
139 adding f2
139 adding f2
140 $ hg book -if @
140 $ hg book -if @
141 $ hg book -if X
141 $ hg book -if X
142 $ hg book
142 $ hg book
143 @ 1:9b140be10808
143 @ 1:9b140be10808
144 X 1:9b140be10808
144 X 1:9b140be10808
145 Y 0:4e3505fd9583
145 Y 0:4e3505fd9583
146 Z 0:4e3505fd9583
146 Z 0:4e3505fd9583
147 foo -1:000000000000
147 foo -1:000000000000
148 * foobar 1:9b140be10808
148 * foobar 1:9b140be10808
149
149
150 $ hg pull --config paths.foo=../a foo
150 $ hg pull --config paths.foo=../a foo
151 pulling from $TESTTMP/a (glob)
151 pulling from $TESTTMP/a (glob)
152 searching for changes
152 searching for changes
153 adding changesets
153 adding changesets
154 adding manifests
154 adding manifests
155 adding file changes
155 adding file changes
156 added 1 changesets with 1 changes to 1 files (+1 heads)
156 added 1 changesets with 1 changes to 1 files (+1 heads)
157 divergent bookmark @ stored as @foo
157 divergent bookmark @ stored as @foo
158 divergent bookmark X stored as X@foo
158 divergent bookmark X stored as X@foo
159 updating bookmark Z
159 updating bookmark Z
160 (run 'hg heads' to see heads, 'hg merge' to merge)
160 (run 'hg heads' to see heads, 'hg merge' to merge)
161 $ hg book
161 $ hg book
162 @ 1:9b140be10808
162 @ 1:9b140be10808
163 @foo 2:0d2164f0ce0d
163 @foo 2:0d2164f0ce0d
164 X 1:9b140be10808
164 X 1:9b140be10808
165 X@foo 2:0d2164f0ce0d
165 X@foo 2:0d2164f0ce0d
166 Y 0:4e3505fd9583
166 Y 0:4e3505fd9583
167 Z 2:0d2164f0ce0d
167 Z 2:0d2164f0ce0d
168 foo -1:000000000000
168 foo -1:000000000000
169 * foobar 1:9b140be10808
169 * foobar 1:9b140be10808
170
170
171 (test that too many divergence of bookmark)
171 (test that too many divergence of bookmark)
172
172
173 $ python $TESTDIR/seq.py 1 100 | while read i; do hg bookmarks -r 000000000000 "X@${i}"; done
173 $ python $TESTDIR/seq.py 1 100 | while read i; do hg bookmarks -r 000000000000 "X@${i}"; done
174 $ hg pull ../a
174 $ hg pull ../a
175 pulling from ../a
175 pulling from ../a
176 searching for changes
176 searching for changes
177 no changes found
177 no changes found
178 warning: failed to assign numbered name to divergent bookmark X
178 warning: failed to assign numbered name to divergent bookmark X
179 divergent bookmark @ stored as @1
179 divergent bookmark @ stored as @1
180 $ hg bookmarks | grep '^ X' | grep -v ':000000000000'
180 $ hg bookmarks | grep '^ X' | grep -v ':000000000000'
181 X 1:9b140be10808
181 X 1:9b140be10808
182 X@foo 2:0d2164f0ce0d
182 X@foo 2:0d2164f0ce0d
183
183
184 (test that remotely diverged bookmarks are reused if they aren't changed)
184 (test that remotely diverged bookmarks are reused if they aren't changed)
185
185
186 $ hg bookmarks | grep '^ @'
186 $ hg bookmarks | grep '^ @'
187 @ 1:9b140be10808
187 @ 1:9b140be10808
188 @1 2:0d2164f0ce0d
188 @1 2:0d2164f0ce0d
189 @foo 2:0d2164f0ce0d
189 @foo 2:0d2164f0ce0d
190 $ hg pull ../a
190 $ hg pull ../a
191 pulling from ../a
191 pulling from ../a
192 searching for changes
192 searching for changes
193 no changes found
193 no changes found
194 warning: failed to assign numbered name to divergent bookmark X
194 warning: failed to assign numbered name to divergent bookmark X
195 divergent bookmark @ stored as @1
195 divergent bookmark @ stored as @1
196 $ hg bookmarks | grep '^ @'
196 $ hg bookmarks | grep '^ @'
197 @ 1:9b140be10808
197 @ 1:9b140be10808
198 @1 2:0d2164f0ce0d
198 @1 2:0d2164f0ce0d
199 @foo 2:0d2164f0ce0d
199 @foo 2:0d2164f0ce0d
200
200
201 $ python $TESTDIR/seq.py 1 100 | while read i; do hg bookmarks -d "X@${i}"; done
201 $ python $TESTDIR/seq.py 1 100 | while read i; do hg bookmarks -d "X@${i}"; done
202 $ hg bookmarks -d "@1"
202 $ hg bookmarks -d "@1"
203
203
204 $ hg push -f ../a
204 $ hg push -f ../a
205 pushing to ../a
205 pushing to ../a
206 searching for changes
206 searching for changes
207 adding changesets
207 adding changesets
208 adding manifests
208 adding manifests
209 adding file changes
209 adding file changes
210 added 1 changesets with 1 changes to 1 files (+1 heads)
210 added 1 changesets with 1 changes to 1 files (+1 heads)
211 $ hg -R ../a book
211 $ hg -R ../a book
212 @ 1:0d2164f0ce0d
212 @ 1:0d2164f0ce0d
213 * X 1:0d2164f0ce0d
213 * X 1:0d2164f0ce0d
214 Y 0:4e3505fd9583
214 Y 0:4e3505fd9583
215 Z 1:0d2164f0ce0d
215 Z 1:0d2164f0ce0d
216
216
217 explicit pull should overwrite the local version (issue4439)
217 explicit pull should overwrite the local version (issue4439)
218
218
219 $ hg pull --config paths.foo=../a foo -B X
219 $ hg pull --config paths.foo=../a foo -B X
220 pulling from $TESTTMP/a (glob)
220 pulling from $TESTTMP/a (glob)
221 no changes found
221 no changes found
222 divergent bookmark @ stored as @foo
222 divergent bookmark @ stored as @foo
223 importing bookmark X
223 importing bookmark X
224
224
225 reinstall state for further testing:
225 reinstall state for further testing:
226
226
227 $ hg book -fr 9b140be10808 X
227 $ hg book -fr 9b140be10808 X
228
228
229 revsets should not ignore divergent bookmarks
229 revsets should not ignore divergent bookmarks
230
230
231 $ hg bookmark -fr 1 Z
231 $ hg bookmark -fr 1 Z
232 $ hg log -r 'bookmark()' --template '{rev}:{node|short} {bookmarks}\n'
232 $ hg log -r 'bookmark()' --template '{rev}:{node|short} {bookmarks}\n'
233 0:4e3505fd9583 Y
233 0:4e3505fd9583 Y
234 1:9b140be10808 @ X Z foobar
234 1:9b140be10808 @ X Z foobar
235 2:0d2164f0ce0d @foo X@foo
235 2:0d2164f0ce0d @foo X@foo
236 $ hg log -r 'bookmark("X@foo")' --template '{rev}:{node|short} {bookmarks}\n'
236 $ hg log -r 'bookmark("X@foo")' --template '{rev}:{node|short} {bookmarks}\n'
237 2:0d2164f0ce0d @foo X@foo
237 2:0d2164f0ce0d @foo X@foo
238 $ hg log -r 'bookmark("re:X@foo")' --template '{rev}:{node|short} {bookmarks}\n'
238 $ hg log -r 'bookmark("re:X@foo")' --template '{rev}:{node|short} {bookmarks}\n'
239 2:0d2164f0ce0d @foo X@foo
239 2:0d2164f0ce0d @foo X@foo
240
240
241 update a remote bookmark from a non-head to a head
241 update a remote bookmark from a non-head to a head
242
242
243 $ hg up -q Y
243 $ hg up -q Y
244 $ echo c3 > f2
244 $ echo c3 > f2
245 $ hg ci -Am3
245 $ hg ci -Am3
246 adding f2
246 adding f2
247 created new head
247 created new head
248 $ hg push ../a
248 $ hg push ../a
249 pushing to ../a
249 pushing to ../a
250 searching for changes
250 searching for changes
251 adding changesets
251 adding changesets
252 adding manifests
252 adding manifests
253 adding file changes
253 adding file changes
254 added 1 changesets with 1 changes to 1 files (+1 heads)
254 added 1 changesets with 1 changes to 1 files (+1 heads)
255 updating bookmark Y
255 updating bookmark Y
256 $ hg -R ../a book
256 $ hg -R ../a book
257 @ 1:0d2164f0ce0d
257 @ 1:0d2164f0ce0d
258 * X 1:0d2164f0ce0d
258 * X 1:0d2164f0ce0d
259 Y 3:f6fc62dde3c0
259 Y 3:f6fc62dde3c0
260 Z 1:0d2164f0ce0d
260 Z 1:0d2164f0ce0d
261
261
262 update a bookmark in the middle of a client pulling changes
262 update a bookmark in the middle of a client pulling changes
263
263
264 $ cd ..
264 $ cd ..
265 $ hg clone -q a pull-race
265 $ hg clone -q a pull-race
266 $ hg clone -q pull-race pull-race2
266
267 We want to use http because it is stateless and therefore more susceptible to
268 race conditions
269
270 $ hg -R pull-race serve -p $HGPORT -d --pid-file=pull-race.pid -E main-error.log
271 $ cat pull-race.pid >> $DAEMON_PIDS
272
273 $ hg clone -q http://localhost:$HGPORT/ pull-race2
267 $ cd pull-race
274 $ cd pull-race
268 $ hg up -q Y
275 $ hg up -q Y
269 $ echo c4 > f2
276 $ echo c4 > f2
270 $ hg ci -Am4
277 $ hg ci -Am4
271 $ echo c5 > f3
278 $ echo c5 > f3
272 $ cat <<EOF > .hg/hgrc
279 $ cat <<EOF > .hg/hgrc
273 > [hooks]
280 > [hooks]
274 > outgoing.makecommit = hg ci -Am5; echo committed in pull-race
281 > outgoing.makecommit = hg ci -Am5; echo committed in pull-race
275 > EOF
282 > EOF
276 $ cd ../pull-race2
283
284 (new config needs a server restart)
285
286 $ cd ..
287 $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS
288 $ hg -R pull-race serve -p $HGPORT -d --pid-file=pull-race.pid -E main-error.log
289 $ cat pull-race.pid >> $DAEMON_PIDS
290 $ cd pull-race2
277 $ hg -R $TESTTMP/pull-race book
291 $ hg -R $TESTTMP/pull-race book
278 @ 1:0d2164f0ce0d
292 @ 1:0d2164f0ce0d
279 X 1:0d2164f0ce0d
293 X 1:0d2164f0ce0d
280 * Y 4:b0a5eff05604
294 * Y 4:b0a5eff05604
281 Z 1:0d2164f0ce0d
295 Z 1:0d2164f0ce0d
282 $ hg pull
296 $ hg pull
283 pulling from $TESTTMP/pull-race (glob)
297 pulling from http://localhost:$HGPORT/
284 searching for changes
298 searching for changes
285 adding f3
286 committed in pull-race
287 adding changesets
299 adding changesets
288 adding manifests
300 adding manifests
289 adding file changes
301 adding file changes
290 added 1 changesets with 1 changes to 1 files
302 added 1 changesets with 1 changes to 1 files
291 updating bookmark Y
303 updating bookmark Y
292 (run 'hg update' to get a working copy)
304 (run 'hg update' to get a working copy)
293 $ hg book
305 $ hg book
294 * @ 1:0d2164f0ce0d
306 * @ 1:0d2164f0ce0d
295 X 1:0d2164f0ce0d
307 X 1:0d2164f0ce0d
296 Y 4:b0a5eff05604
308 Y 4:b0a5eff05604
297 Z 1:0d2164f0ce0d
309 Z 1:0d2164f0ce0d
310
311 (done with this section of the test)
312
313 $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS
298 $ cd ../b
314 $ cd ../b
299
315
300 diverging a remote bookmark fails
316 diverging a remote bookmark fails
301
317
302 $ hg up -q 4e3505fd9583
318 $ hg up -q 4e3505fd9583
303 $ echo c4 > f2
319 $ echo c4 > f2
304 $ hg ci -Am4
320 $ hg ci -Am4
305 adding f2
321 adding f2
306 created new head
322 created new head
307 $ echo c5 > f2
323 $ echo c5 > f2
308 $ hg ci -Am5
324 $ hg ci -Am5
309 $ hg log -G
325 $ hg log -G
310 @ 5:c922c0139ca0 5
326 @ 5:c922c0139ca0 5
311 |
327 |
312 o 4:4efff6d98829 4
328 o 4:4efff6d98829 4
313 |
329 |
314 | o 3:f6fc62dde3c0 3
330 | o 3:f6fc62dde3c0 3
315 |/
331 |/
316 | o 2:0d2164f0ce0d 1
332 | o 2:0d2164f0ce0d 1
317 |/
333 |/
318 | o 1:9b140be10808 2
334 | o 1:9b140be10808 2
319 |/
335 |/
320 o 0:4e3505fd9583 test
336 o 0:4e3505fd9583 test
321
337
322
338
323 $ hg book -f Y
339 $ hg book -f Y
324
340
325 $ cat <<EOF > ../a/.hg/hgrc
341 $ cat <<EOF > ../a/.hg/hgrc
326 > [web]
342 > [web]
327 > push_ssl = false
343 > push_ssl = false
328 > allow_push = *
344 > allow_push = *
329 > EOF
345 > EOF
330
346
331 $ hg -R ../a serve -p $HGPORT2 -d --pid-file=../hg2.pid
347 $ hg -R ../a serve -p $HGPORT2 -d --pid-file=../hg2.pid
332 $ cat ../hg2.pid >> $DAEMON_PIDS
348 $ cat ../hg2.pid >> $DAEMON_PIDS
333
349
334 $ hg push http://localhost:$HGPORT2/
350 $ hg push http://localhost:$HGPORT2/
335 pushing to http://localhost:$HGPORT2/
351 pushing to http://localhost:$HGPORT2/
336 searching for changes
352 searching for changes
337 abort: push creates new remote head c922c0139ca0 with bookmark 'Y'!
353 abort: push creates new remote head c922c0139ca0 with bookmark 'Y'!
338 (merge or see "hg help push" for details about pushing new heads)
354 (merge or see "hg help push" for details about pushing new heads)
339 [255]
355 [255]
340 $ hg -R ../a book
356 $ hg -R ../a book
341 @ 1:0d2164f0ce0d
357 @ 1:0d2164f0ce0d
342 * X 1:0d2164f0ce0d
358 * X 1:0d2164f0ce0d
343 Y 3:f6fc62dde3c0
359 Y 3:f6fc62dde3c0
344 Z 1:0d2164f0ce0d
360 Z 1:0d2164f0ce0d
345
361
346
362
347 Unrelated marker does not alter the decision
363 Unrelated marker does not alter the decision
348
364
349 $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
365 $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
350 $ hg push http://localhost:$HGPORT2/
366 $ hg push http://localhost:$HGPORT2/
351 pushing to http://localhost:$HGPORT2/
367 pushing to http://localhost:$HGPORT2/
352 searching for changes
368 searching for changes
353 abort: push creates new remote head c922c0139ca0 with bookmark 'Y'!
369 abort: push creates new remote head c922c0139ca0 with bookmark 'Y'!
354 (merge or see "hg help push" for details about pushing new heads)
370 (merge or see "hg help push" for details about pushing new heads)
355 [255]
371 [255]
356 $ hg -R ../a book
372 $ hg -R ../a book
357 @ 1:0d2164f0ce0d
373 @ 1:0d2164f0ce0d
358 * X 1:0d2164f0ce0d
374 * X 1:0d2164f0ce0d
359 Y 3:f6fc62dde3c0
375 Y 3:f6fc62dde3c0
360 Z 1:0d2164f0ce0d
376 Z 1:0d2164f0ce0d
361
377
362 Update to a successor works
378 Update to a successor works
363
379
364 $ hg id --debug -r 3
380 $ hg id --debug -r 3
365 f6fc62dde3c0771e29704af56ba4d8af77abcc2f
381 f6fc62dde3c0771e29704af56ba4d8af77abcc2f
366 $ hg id --debug -r 4
382 $ hg id --debug -r 4
367 4efff6d98829d9c824c621afd6e3f01865f5439f
383 4efff6d98829d9c824c621afd6e3f01865f5439f
368 $ hg id --debug -r 5
384 $ hg id --debug -r 5
369 c922c0139ca03858f655e4a2af4dd02796a63969 tip Y
385 c922c0139ca03858f655e4a2af4dd02796a63969 tip Y
370 $ hg debugobsolete f6fc62dde3c0771e29704af56ba4d8af77abcc2f cccccccccccccccccccccccccccccccccccccccc
386 $ hg debugobsolete f6fc62dde3c0771e29704af56ba4d8af77abcc2f cccccccccccccccccccccccccccccccccccccccc
371 $ hg debugobsolete cccccccccccccccccccccccccccccccccccccccc 4efff6d98829d9c824c621afd6e3f01865f5439f
387 $ hg debugobsolete cccccccccccccccccccccccccccccccccccccccc 4efff6d98829d9c824c621afd6e3f01865f5439f
372 $ hg push http://localhost:$HGPORT2/
388 $ hg push http://localhost:$HGPORT2/
373 pushing to http://localhost:$HGPORT2/
389 pushing to http://localhost:$HGPORT2/
374 searching for changes
390 searching for changes
375 remote: adding changesets
391 remote: adding changesets
376 remote: adding manifests
392 remote: adding manifests
377 remote: adding file changes
393 remote: adding file changes
378 remote: added 2 changesets with 2 changes to 1 files (+1 heads)
394 remote: added 2 changesets with 2 changes to 1 files (+1 heads)
379 remote: 2 new obsolescence markers
395 remote: 2 new obsolescence markers
380 updating bookmark Y
396 updating bookmark Y
381 $ hg -R ../a book
397 $ hg -R ../a book
382 @ 1:0d2164f0ce0d
398 @ 1:0d2164f0ce0d
383 * X 1:0d2164f0ce0d
399 * X 1:0d2164f0ce0d
384 Y 5:c922c0139ca0
400 Y 5:c922c0139ca0
385 Z 1:0d2164f0ce0d
401 Z 1:0d2164f0ce0d
386
402
387 hgweb
403 hgweb
388
404
389 $ cat <<EOF > .hg/hgrc
405 $ cat <<EOF > .hg/hgrc
390 > [web]
406 > [web]
391 > push_ssl = false
407 > push_ssl = false
392 > allow_push = *
408 > allow_push = *
393 > EOF
409 > EOF
394
410
395 $ hg serve -p $HGPORT -d --pid-file=../hg.pid -E errors.log
411 $ hg serve -p $HGPORT -d --pid-file=../hg.pid -E errors.log
396 $ cat ../hg.pid >> $DAEMON_PIDS
412 $ cat ../hg.pid >> $DAEMON_PIDS
397 $ cd ../a
413 $ cd ../a
398
414
399 $ hg debugpushkey http://localhost:$HGPORT/ namespaces
415 $ hg debugpushkey http://localhost:$HGPORT/ namespaces
400 bookmarks
416 bookmarks
401 namespaces
417 namespaces
402 obsolete
418 obsolete
403 phases
419 phases
404 $ hg debugpushkey http://localhost:$HGPORT/ bookmarks
420 $ hg debugpushkey http://localhost:$HGPORT/ bookmarks
405 @ 9b140be1080824d768c5a4691a564088eede71f9
421 @ 9b140be1080824d768c5a4691a564088eede71f9
406 X 9b140be1080824d768c5a4691a564088eede71f9
422 X 9b140be1080824d768c5a4691a564088eede71f9
407 Y c922c0139ca03858f655e4a2af4dd02796a63969
423 Y c922c0139ca03858f655e4a2af4dd02796a63969
408 Z 9b140be1080824d768c5a4691a564088eede71f9
424 Z 9b140be1080824d768c5a4691a564088eede71f9
409 foo 0000000000000000000000000000000000000000
425 foo 0000000000000000000000000000000000000000
410 foobar 9b140be1080824d768c5a4691a564088eede71f9
426 foobar 9b140be1080824d768c5a4691a564088eede71f9
411 $ hg out -B http://localhost:$HGPORT/
427 $ hg out -B http://localhost:$HGPORT/
412 comparing with http://localhost:$HGPORT/
428 comparing with http://localhost:$HGPORT/
413 searching for changed bookmarks
429 searching for changed bookmarks
414 @ 0d2164f0ce0d
430 @ 0d2164f0ce0d
415 X 0d2164f0ce0d
431 X 0d2164f0ce0d
416 Z 0d2164f0ce0d
432 Z 0d2164f0ce0d
417 foo
433 foo
418 foobar
434 foobar
419 $ hg push -B Z http://localhost:$HGPORT/
435 $ hg push -B Z http://localhost:$HGPORT/
420 pushing to http://localhost:$HGPORT/
436 pushing to http://localhost:$HGPORT/
421 searching for changes
437 searching for changes
422 no changes found
438 no changes found
423 updating bookmark Z
439 updating bookmark Z
424 [1]
440 [1]
425 $ hg book -d Z
441 $ hg book -d Z
426 $ hg in -B http://localhost:$HGPORT/
442 $ hg in -B http://localhost:$HGPORT/
427 comparing with http://localhost:$HGPORT/
443 comparing with http://localhost:$HGPORT/
428 searching for changed bookmarks
444 searching for changed bookmarks
429 @ 9b140be10808
445 @ 9b140be10808
430 X 9b140be10808
446 X 9b140be10808
431 Z 0d2164f0ce0d
447 Z 0d2164f0ce0d
432 foo 000000000000
448 foo 000000000000
433 foobar 9b140be10808
449 foobar 9b140be10808
434 $ hg pull -B Z http://localhost:$HGPORT/
450 $ hg pull -B Z http://localhost:$HGPORT/
435 pulling from http://localhost:$HGPORT/
451 pulling from http://localhost:$HGPORT/
436 no changes found
452 no changes found
437 divergent bookmark @ stored as @1
453 divergent bookmark @ stored as @1
438 divergent bookmark X stored as X@1
454 divergent bookmark X stored as X@1
439 adding remote bookmark Z
455 adding remote bookmark Z
440 adding remote bookmark foo
456 adding remote bookmark foo
441 adding remote bookmark foobar
457 adding remote bookmark foobar
442 $ hg clone http://localhost:$HGPORT/ cloned-bookmarks
458 $ hg clone http://localhost:$HGPORT/ cloned-bookmarks
443 requesting all changes
459 requesting all changes
444 adding changesets
460 adding changesets
445 adding manifests
461 adding manifests
446 adding file changes
462 adding file changes
447 added 5 changesets with 5 changes to 3 files (+2 heads)
463 added 5 changesets with 5 changes to 3 files (+2 heads)
448 2 new obsolescence markers
464 2 new obsolescence markers
449 updating to bookmark @
465 updating to bookmark @
450 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
466 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
451 $ hg -R cloned-bookmarks bookmarks
467 $ hg -R cloned-bookmarks bookmarks
452 * @ 1:9b140be10808
468 * @ 1:9b140be10808
453 X 1:9b140be10808
469 X 1:9b140be10808
454 Y 4:c922c0139ca0
470 Y 4:c922c0139ca0
455 Z 2:0d2164f0ce0d
471 Z 2:0d2164f0ce0d
456 foo -1:000000000000
472 foo -1:000000000000
457 foobar 1:9b140be10808
473 foobar 1:9b140be10808
458
474
459 $ cd ..
475 $ cd ..
460
476
461 Test to show result of bookmarks comparision
477 Test to show result of bookmarks comparision
462
478
463 $ mkdir bmcomparison
479 $ mkdir bmcomparison
464 $ cd bmcomparison
480 $ cd bmcomparison
465
481
466 $ hg init source
482 $ hg init source
467 $ hg -R source debugbuilddag '+2*2*3*4'
483 $ hg -R source debugbuilddag '+2*2*3*4'
468 $ hg -R source log -G --template '{rev}:{node|short}'
484 $ hg -R source log -G --template '{rev}:{node|short}'
469 o 4:e7bd5218ca15
485 o 4:e7bd5218ca15
470 |
486 |
471 | o 3:6100d3090acf
487 | o 3:6100d3090acf
472 |/
488 |/
473 | o 2:fa942426a6fd
489 | o 2:fa942426a6fd
474 |/
490 |/
475 | o 1:66f7d451a68b
491 | o 1:66f7d451a68b
476 |/
492 |/
477 o 0:1ea73414a91b
493 o 0:1ea73414a91b
478
494
479 $ hg -R source bookmarks -r 0 SAME
495 $ hg -R source bookmarks -r 0 SAME
480 $ hg -R source bookmarks -r 0 ADV_ON_REPO1
496 $ hg -R source bookmarks -r 0 ADV_ON_REPO1
481 $ hg -R source bookmarks -r 0 ADV_ON_REPO2
497 $ hg -R source bookmarks -r 0 ADV_ON_REPO2
482 $ hg -R source bookmarks -r 0 DIFF_ADV_ON_REPO1
498 $ hg -R source bookmarks -r 0 DIFF_ADV_ON_REPO1
483 $ hg -R source bookmarks -r 0 DIFF_ADV_ON_REPO2
499 $ hg -R source bookmarks -r 0 DIFF_ADV_ON_REPO2
484 $ hg -R source bookmarks -r 1 DIVERGED
500 $ hg -R source bookmarks -r 1 DIVERGED
485
501
486 $ hg clone -U source repo1
502 $ hg clone -U source repo1
487
503
488 (test that incoming/outgoing exit with 1, if there is no bookmark to
504 (test that incoming/outgoing exit with 1, if there is no bookmark to
489 be excahnged)
505 be excahnged)
490
506
491 $ hg -R repo1 incoming -B
507 $ hg -R repo1 incoming -B
492 comparing with $TESTTMP/bmcomparison/source
508 comparing with $TESTTMP/bmcomparison/source
493 searching for changed bookmarks
509 searching for changed bookmarks
494 no changed bookmarks found
510 no changed bookmarks found
495 [1]
511 [1]
496 $ hg -R repo1 outgoing -B
512 $ hg -R repo1 outgoing -B
497 comparing with $TESTTMP/bmcomparison/source
513 comparing with $TESTTMP/bmcomparison/source
498 searching for changed bookmarks
514 searching for changed bookmarks
499 no changed bookmarks found
515 no changed bookmarks found
500 [1]
516 [1]
501
517
502 $ hg -R repo1 bookmarks -f -r 1 ADD_ON_REPO1
518 $ hg -R repo1 bookmarks -f -r 1 ADD_ON_REPO1
503 $ hg -R repo1 bookmarks -f -r 2 ADV_ON_REPO1
519 $ hg -R repo1 bookmarks -f -r 2 ADV_ON_REPO1
504 $ hg -R repo1 bookmarks -f -r 3 DIFF_ADV_ON_REPO1
520 $ hg -R repo1 bookmarks -f -r 3 DIFF_ADV_ON_REPO1
505 $ hg -R repo1 bookmarks -f -r 3 DIFF_DIVERGED
521 $ hg -R repo1 bookmarks -f -r 3 DIFF_DIVERGED
506 $ hg -R repo1 -q --config extensions.mq= strip 4
522 $ hg -R repo1 -q --config extensions.mq= strip 4
507 $ hg -R repo1 log -G --template '{node|short} ({bookmarks})'
523 $ hg -R repo1 log -G --template '{node|short} ({bookmarks})'
508 o 6100d3090acf (DIFF_ADV_ON_REPO1 DIFF_DIVERGED)
524 o 6100d3090acf (DIFF_ADV_ON_REPO1 DIFF_DIVERGED)
509 |
525 |
510 | o fa942426a6fd (ADV_ON_REPO1)
526 | o fa942426a6fd (ADV_ON_REPO1)
511 |/
527 |/
512 | o 66f7d451a68b (ADD_ON_REPO1 DIVERGED)
528 | o 66f7d451a68b (ADD_ON_REPO1 DIVERGED)
513 |/
529 |/
514 o 1ea73414a91b (ADV_ON_REPO2 DIFF_ADV_ON_REPO2 SAME)
530 o 1ea73414a91b (ADV_ON_REPO2 DIFF_ADV_ON_REPO2 SAME)
515
531
516
532
517 $ hg clone -U source repo2
533 $ hg clone -U source repo2
518 $ hg -R repo2 bookmarks -f -r 1 ADD_ON_REPO2
534 $ hg -R repo2 bookmarks -f -r 1 ADD_ON_REPO2
519 $ hg -R repo2 bookmarks -f -r 1 ADV_ON_REPO2
535 $ hg -R repo2 bookmarks -f -r 1 ADV_ON_REPO2
520 $ hg -R repo2 bookmarks -f -r 2 DIVERGED
536 $ hg -R repo2 bookmarks -f -r 2 DIVERGED
521 $ hg -R repo2 bookmarks -f -r 4 DIFF_ADV_ON_REPO2
537 $ hg -R repo2 bookmarks -f -r 4 DIFF_ADV_ON_REPO2
522 $ hg -R repo2 bookmarks -f -r 4 DIFF_DIVERGED
538 $ hg -R repo2 bookmarks -f -r 4 DIFF_DIVERGED
523 $ hg -R repo2 -q --config extensions.mq= strip 3
539 $ hg -R repo2 -q --config extensions.mq= strip 3
524 $ hg -R repo2 log -G --template '{node|short} ({bookmarks})'
540 $ hg -R repo2 log -G --template '{node|short} ({bookmarks})'
525 o e7bd5218ca15 (DIFF_ADV_ON_REPO2 DIFF_DIVERGED)
541 o e7bd5218ca15 (DIFF_ADV_ON_REPO2 DIFF_DIVERGED)
526 |
542 |
527 | o fa942426a6fd (DIVERGED)
543 | o fa942426a6fd (DIVERGED)
528 |/
544 |/
529 | o 66f7d451a68b (ADD_ON_REPO2 ADV_ON_REPO2)
545 | o 66f7d451a68b (ADD_ON_REPO2 ADV_ON_REPO2)
530 |/
546 |/
531 o 1ea73414a91b (ADV_ON_REPO1 DIFF_ADV_ON_REPO1 SAME)
547 o 1ea73414a91b (ADV_ON_REPO1 DIFF_ADV_ON_REPO1 SAME)
532
548
533
549
534 (test that difference of bookmarks between repositories are fully shown)
550 (test that difference of bookmarks between repositories are fully shown)
535
551
536 $ hg -R repo1 incoming -B repo2 -v
552 $ hg -R repo1 incoming -B repo2 -v
537 comparing with repo2
553 comparing with repo2
538 searching for changed bookmarks
554 searching for changed bookmarks
539 ADD_ON_REPO2 66f7d451a68b added
555 ADD_ON_REPO2 66f7d451a68b added
540 ADV_ON_REPO2 66f7d451a68b advanced
556 ADV_ON_REPO2 66f7d451a68b advanced
541 DIFF_ADV_ON_REPO2 e7bd5218ca15 changed
557 DIFF_ADV_ON_REPO2 e7bd5218ca15 changed
542 DIFF_DIVERGED e7bd5218ca15 changed
558 DIFF_DIVERGED e7bd5218ca15 changed
543 DIVERGED fa942426a6fd diverged
559 DIVERGED fa942426a6fd diverged
544 $ hg -R repo1 outgoing -B repo2 -v
560 $ hg -R repo1 outgoing -B repo2 -v
545 comparing with repo2
561 comparing with repo2
546 searching for changed bookmarks
562 searching for changed bookmarks
547 ADD_ON_REPO1 66f7d451a68b added
563 ADD_ON_REPO1 66f7d451a68b added
548 ADD_ON_REPO2 deleted
564 ADD_ON_REPO2 deleted
549 ADV_ON_REPO1 fa942426a6fd advanced
565 ADV_ON_REPO1 fa942426a6fd advanced
550 DIFF_ADV_ON_REPO1 6100d3090acf advanced
566 DIFF_ADV_ON_REPO1 6100d3090acf advanced
551 DIFF_ADV_ON_REPO2 1ea73414a91b changed
567 DIFF_ADV_ON_REPO2 1ea73414a91b changed
552 DIFF_DIVERGED 6100d3090acf changed
568 DIFF_DIVERGED 6100d3090acf changed
553 DIVERGED 66f7d451a68b diverged
569 DIVERGED 66f7d451a68b diverged
554
570
555 $ hg -R repo2 incoming -B repo1 -v
571 $ hg -R repo2 incoming -B repo1 -v
556 comparing with repo1
572 comparing with repo1
557 searching for changed bookmarks
573 searching for changed bookmarks
558 ADD_ON_REPO1 66f7d451a68b added
574 ADD_ON_REPO1 66f7d451a68b added
559 ADV_ON_REPO1 fa942426a6fd advanced
575 ADV_ON_REPO1 fa942426a6fd advanced
560 DIFF_ADV_ON_REPO1 6100d3090acf changed
576 DIFF_ADV_ON_REPO1 6100d3090acf changed
561 DIFF_DIVERGED 6100d3090acf changed
577 DIFF_DIVERGED 6100d3090acf changed
562 DIVERGED 66f7d451a68b diverged
578 DIVERGED 66f7d451a68b diverged
563 $ hg -R repo2 outgoing -B repo1 -v
579 $ hg -R repo2 outgoing -B repo1 -v
564 comparing with repo1
580 comparing with repo1
565 searching for changed bookmarks
581 searching for changed bookmarks
566 ADD_ON_REPO1 deleted
582 ADD_ON_REPO1 deleted
567 ADD_ON_REPO2 66f7d451a68b added
583 ADD_ON_REPO2 66f7d451a68b added
568 ADV_ON_REPO2 66f7d451a68b advanced
584 ADV_ON_REPO2 66f7d451a68b advanced
569 DIFF_ADV_ON_REPO1 1ea73414a91b changed
585 DIFF_ADV_ON_REPO1 1ea73414a91b changed
570 DIFF_ADV_ON_REPO2 e7bd5218ca15 advanced
586 DIFF_ADV_ON_REPO2 e7bd5218ca15 advanced
571 DIFF_DIVERGED e7bd5218ca15 changed
587 DIFF_DIVERGED e7bd5218ca15 changed
572 DIVERGED fa942426a6fd diverged
588 DIVERGED fa942426a6fd diverged
573
589
574 $ cd ..
590 $ cd ..
575
591
576 Pushing a bookmark should only push the changes required by that
592 Pushing a bookmark should only push the changes required by that
577 bookmark, not all outgoing changes:
593 bookmark, not all outgoing changes:
578 $ hg clone http://localhost:$HGPORT/ addmarks
594 $ hg clone http://localhost:$HGPORT/ addmarks
579 requesting all changes
595 requesting all changes
580 adding changesets
596 adding changesets
581 adding manifests
597 adding manifests
582 adding file changes
598 adding file changes
583 added 5 changesets with 5 changes to 3 files (+2 heads)
599 added 5 changesets with 5 changes to 3 files (+2 heads)
584 2 new obsolescence markers
600 2 new obsolescence markers
585 updating to bookmark @
601 updating to bookmark @
586 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
602 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
587 $ cd addmarks
603 $ cd addmarks
588 $ echo foo > foo
604 $ echo foo > foo
589 $ hg add foo
605 $ hg add foo
590 $ hg commit -m 'add foo'
606 $ hg commit -m 'add foo'
591 $ echo bar > bar
607 $ echo bar > bar
592 $ hg add bar
608 $ hg add bar
593 $ hg commit -m 'add bar'
609 $ hg commit -m 'add bar'
594 $ hg co "tip^"
610 $ hg co "tip^"
595 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
611 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
596 (leaving bookmark @)
612 (leaving bookmark @)
597 $ hg book add-foo
613 $ hg book add-foo
598 $ hg book -r tip add-bar
614 $ hg book -r tip add-bar
599 Note: this push *must* push only a single changeset, as that's the point
615 Note: this push *must* push only a single changeset, as that's the point
600 of this test.
616 of this test.
601 $ hg push -B add-foo --traceback
617 $ hg push -B add-foo --traceback
602 pushing to http://localhost:$HGPORT/
618 pushing to http://localhost:$HGPORT/
603 searching for changes
619 searching for changes
604 remote: adding changesets
620 remote: adding changesets
605 remote: adding manifests
621 remote: adding manifests
606 remote: adding file changes
622 remote: adding file changes
607 remote: added 1 changesets with 1 changes to 1 files
623 remote: added 1 changesets with 1 changes to 1 files
608 exporting bookmark add-foo
624 exporting bookmark add-foo
609
625
610 pushing a new bookmark on a new head does not require -f if -B is specified
626 pushing a new bookmark on a new head does not require -f if -B is specified
611
627
612 $ hg up -q X
628 $ hg up -q X
613 $ hg book W
629 $ hg book W
614 $ echo c5 > f2
630 $ echo c5 > f2
615 $ hg ci -Am5
631 $ hg ci -Am5
616 created new head
632 created new head
617 $ hg push -B W
633 $ hg push -B W
618 pushing to http://localhost:$HGPORT/
634 pushing to http://localhost:$HGPORT/
619 searching for changes
635 searching for changes
620 remote: adding changesets
636 remote: adding changesets
621 remote: adding manifests
637 remote: adding manifests
622 remote: adding file changes
638 remote: adding file changes
623 remote: added 1 changesets with 1 changes to 1 files (+1 heads)
639 remote: added 1 changesets with 1 changes to 1 files (+1 heads)
624 exporting bookmark W
640 exporting bookmark W
625 $ hg -R ../b id -r W
641 $ hg -R ../b id -r W
626 cc978a373a53 tip W
642 cc978a373a53 tip W
627
643
628 Check summary output for incoming/outgoing bookmarks
644 Check summary output for incoming/outgoing bookmarks
629
645
630 $ hg bookmarks -d X
646 $ hg bookmarks -d X
631 $ hg bookmarks -d Y
647 $ hg bookmarks -d Y
632 $ hg summary --remote | grep '^remote:'
648 $ hg summary --remote | grep '^remote:'
633 remote: *, 2 incoming bookmarks, 1 outgoing bookmarks (glob)
649 remote: *, 2 incoming bookmarks, 1 outgoing bookmarks (glob)
634
650
635 $ cd ..
651 $ cd ..
636
652
637 pushing an unchanged bookmark should result in no changes
653 pushing an unchanged bookmark should result in no changes
638
654
639 $ hg init unchanged-a
655 $ hg init unchanged-a
640 $ hg init unchanged-b
656 $ hg init unchanged-b
641 $ cd unchanged-a
657 $ cd unchanged-a
642 $ echo initial > foo
658 $ echo initial > foo
643 $ hg commit -A -m initial
659 $ hg commit -A -m initial
644 adding foo
660 adding foo
645 $ hg bookmark @
661 $ hg bookmark @
646 $ hg push -B @ ../unchanged-b
662 $ hg push -B @ ../unchanged-b
647 pushing to ../unchanged-b
663 pushing to ../unchanged-b
648 searching for changes
664 searching for changes
649 adding changesets
665 adding changesets
650 adding manifests
666 adding manifests
651 adding file changes
667 adding file changes
652 added 1 changesets with 1 changes to 1 files
668 added 1 changesets with 1 changes to 1 files
653 exporting bookmark @
669 exporting bookmark @
654
670
655 $ hg push -B @ ../unchanged-b
671 $ hg push -B @ ../unchanged-b
656 pushing to ../unchanged-b
672 pushing to ../unchanged-b
657 searching for changes
673 searching for changes
658 no changes found
674 no changes found
659 [1]
675 [1]
660
676
661
677
662 Check hook preventing push (issue4455)
678 Check hook preventing push (issue4455)
663 ======================================
679 ======================================
664
680
665 $ hg bookmarks
681 $ hg bookmarks
666 * @ 0:55482a6fb4b1
682 * @ 0:55482a6fb4b1
667 $ hg log -G
683 $ hg log -G
668 @ 0:55482a6fb4b1 initial
684 @ 0:55482a6fb4b1 initial
669
685
670 $ hg init ../issue4455-dest
686 $ hg init ../issue4455-dest
671 $ hg push ../issue4455-dest # changesets only
687 $ hg push ../issue4455-dest # changesets only
672 pushing to ../issue4455-dest
688 pushing to ../issue4455-dest
673 searching for changes
689 searching for changes
674 adding changesets
690 adding changesets
675 adding manifests
691 adding manifests
676 adding file changes
692 adding file changes
677 added 1 changesets with 1 changes to 1 files
693 added 1 changesets with 1 changes to 1 files
678 $ cat >> .hg/hgrc << EOF
694 $ cat >> .hg/hgrc << EOF
679 > [paths]
695 > [paths]
680 > local=../issue4455-dest/
696 > local=../issue4455-dest/
681 > ssh=ssh://user@dummy/issue4455-dest
697 > ssh=ssh://user@dummy/issue4455-dest
682 > http=http://localhost:$HGPORT/
698 > http=http://localhost:$HGPORT/
683 > [ui]
699 > [ui]
684 > ssh=python "$TESTDIR/dummyssh"
700 > ssh=python "$TESTDIR/dummyssh"
685 > EOF
701 > EOF
686 $ cat >> ../issue4455-dest/.hg/hgrc << EOF
702 $ cat >> ../issue4455-dest/.hg/hgrc << EOF
687 > [hooks]
703 > [hooks]
688 > prepushkey=false
704 > prepushkey=false
689 > [web]
705 > [web]
690 > push_ssl = false
706 > push_ssl = false
691 > allow_push = *
707 > allow_push = *
692 > EOF
708 > EOF
693 $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS
709 $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS
694 $ hg -R ../issue4455-dest serve -p $HGPORT -d --pid-file=../issue4455.pid -E ../issue4455-error.log
710 $ hg -R ../issue4455-dest serve -p $HGPORT -d --pid-file=../issue4455.pid -E ../issue4455-error.log
695 $ cat ../issue4455.pid >> $DAEMON_PIDS
711 $ cat ../issue4455.pid >> $DAEMON_PIDS
696
712
697 Local push
713 Local push
698 ----------
714 ----------
699
715
700 $ hg push -B @ local
716 $ hg push -B @ local
701 pushing to $TESTTMP/issue4455-dest (glob)
717 pushing to $TESTTMP/issue4455-dest (glob)
702 searching for changes
718 searching for changes
703 no changes found
719 no changes found
704 pushkey-abort: prepushkey hook exited with status 1
720 pushkey-abort: prepushkey hook exited with status 1
705 exporting bookmark @ failed!
721 exporting bookmark @ failed!
706 [1]
722 [1]
707 $ hg -R ../issue4455-dest/ bookmarks
723 $ hg -R ../issue4455-dest/ bookmarks
708 no bookmarks set
724 no bookmarks set
709
725
710 Using ssh
726 Using ssh
711 ---------
727 ---------
712
728
713 $ hg push -B @ ssh --config experimental.bundle2-exp=True
729 $ hg push -B @ ssh --config experimental.bundle2-exp=True
714 pushing to ssh://user@dummy/issue4455-dest
730 pushing to ssh://user@dummy/issue4455-dest
715 searching for changes
731 searching for changes
716 no changes found
732 no changes found
717 remote: pushkey-abort: prepushkey hook exited with status 1
733 remote: pushkey-abort: prepushkey hook exited with status 1
718 exporting bookmark @ failed!
734 exporting bookmark @ failed!
719 [1]
735 [1]
720 $ hg -R ../issue4455-dest/ bookmarks
736 $ hg -R ../issue4455-dest/ bookmarks
721 no bookmarks set
737 no bookmarks set
722
738
723 $ hg push -B @ ssh --config experimental.bundle2-exp=False
739 $ hg push -B @ ssh --config experimental.bundle2-exp=False
724 pushing to ssh://user@dummy/issue4455-dest
740 pushing to ssh://user@dummy/issue4455-dest
725 searching for changes
741 searching for changes
726 no changes found
742 no changes found
727 remote: pushkey-abort: prepushkey hook exited with status 1
743 remote: pushkey-abort: prepushkey hook exited with status 1
728 exporting bookmark @ failed!
744 exporting bookmark @ failed!
729 [1]
745 [1]
730 $ hg -R ../issue4455-dest/ bookmarks
746 $ hg -R ../issue4455-dest/ bookmarks
731 no bookmarks set
747 no bookmarks set
732
748
733 Using http
749 Using http
734 ----------
750 ----------
735
751
736 $ hg push -B @ http --config experimental.bundle2-exp=True
752 $ hg push -B @ http --config experimental.bundle2-exp=True
737 pushing to http://localhost:$HGPORT/
753 pushing to http://localhost:$HGPORT/
738 searching for changes
754 searching for changes
739 no changes found
755 no changes found
740 remote: pushkey-abort: prepushkey hook exited with status 1
756 remote: pushkey-abort: prepushkey hook exited with status 1
741 exporting bookmark @ failed!
757 exporting bookmark @ failed!
742 [1]
758 [1]
743 $ hg -R ../issue4455-dest/ bookmarks
759 $ hg -R ../issue4455-dest/ bookmarks
744 no bookmarks set
760 no bookmarks set
745
761
746 $ hg push -B @ http --config experimental.bundle2-exp=False
762 $ hg push -B @ http --config experimental.bundle2-exp=False
747 pushing to http://localhost:$HGPORT/
763 pushing to http://localhost:$HGPORT/
748 searching for changes
764 searching for changes
749 no changes found
765 no changes found
750 remote: pushkey-abort: prepushkey hook exited with status 1
766 remote: pushkey-abort: prepushkey hook exited with status 1
751 exporting bookmark @ failed!
767 exporting bookmark @ failed!
752 [1]
768 [1]
753 $ hg -R ../issue4455-dest/ bookmarks
769 $ hg -R ../issue4455-dest/ bookmarks
754 no bookmarks set
770 no bookmarks set
General Comments 0
You need to be logged in to leave comments. Login now