Show More
@@ -68,6 +68,7 b' testpats = [' | |||||
68 | (r'touch -d', "don't use 'touch -d', use 'touch -t' instead"), |
|
68 | (r'touch -d', "don't use 'touch -d', use 'touch -t' instead"), | |
69 | (r'ls\s+[^|-]+\s+-', "options to 'ls' must come before filenames"), |
|
69 | (r'ls\s+[^|-]+\s+-', "options to 'ls' must come before filenames"), | |
70 | (r'[^>]>\s*\$HGRCPATH', "don't overwrite $HGRCPATH, append to it"), |
|
70 | (r'[^>]>\s*\$HGRCPATH', "don't overwrite $HGRCPATH, append to it"), | |
|
71 | (r'stop\(\)', "don't use 'stop' as a shell function name"), | |||
71 | ], |
|
72 | ], | |
72 | # warnings |
|
73 | # warnings | |
73 | [] |
|
74 | [] |
@@ -17,7 +17,7 b' Setup HTTP server control:' | |||||
17 |
|
17 | |||
18 | $ remote=http://localhost:$HGPORT/ |
|
18 | $ remote=http://localhost:$HGPORT/ | |
19 | $ export remote |
|
19 | $ export remote | |
20 | $ start() { |
|
20 | $ tstart() { | |
21 | > echo '[web]' > $1/.hg/hgrc |
|
21 | > echo '[web]' > $1/.hg/hgrc | |
22 | > echo 'push_ssl = false' >> $1/.hg/hgrc |
|
22 | > echo 'push_ssl = false' >> $1/.hg/hgrc | |
23 | > echo 'allow_push = *' >> $1/.hg/hgrc |
|
23 | > echo 'allow_push = *' >> $1/.hg/hgrc | |
@@ -25,7 +25,7 b' Setup HTTP server control:' | |||||
25 | > hg serve -R $1 -p $HGPORT -d --pid-file=hg.pid -E errors.log |
|
25 | > hg serve -R $1 -p $HGPORT -d --pid-file=hg.pid -E errors.log | |
26 | > cat hg.pid >> $DAEMON_PIDS |
|
26 | > cat hg.pid >> $DAEMON_PIDS | |
27 | > } |
|
27 | > } | |
28 | $ stop() { |
|
28 | $ tstop() { | |
29 | > "$TESTDIR/killdaemons.py" |
|
29 | > "$TESTDIR/killdaemons.py" | |
30 | > cp $HGRCPATH-withcap $HGRCPATH |
|
30 | > cp $HGRCPATH-withcap $HGRCPATH | |
31 | > } |
|
31 | > } | |
@@ -34,7 +34,7 b' Both are empty:' | |||||
34 |
|
34 | |||
35 | $ hg init empty1 |
|
35 | $ hg init empty1 | |
36 | $ hg init empty2 |
|
36 | $ hg init empty2 | |
37 | $ start empty2 |
|
37 | $ tstart empty2 | |
38 | $ hg incoming -R empty1 $remote |
|
38 | $ hg incoming -R empty1 $remote | |
39 | comparing with http://localhost:$HGPORT/ |
|
39 | comparing with http://localhost:$HGPORT/ | |
40 | no changes found |
|
40 | no changes found | |
@@ -49,7 +49,7 b' Both are empty:' | |||||
49 | $ hg push -R empty1 $remote |
|
49 | $ hg push -R empty1 $remote | |
50 | pushing to http://localhost:$HGPORT/ |
|
50 | pushing to http://localhost:$HGPORT/ | |
51 | no changes found |
|
51 | no changes found | |
52 | $ stop |
|
52 | $ tstop | |
53 |
|
53 | |||
54 | Base repo: |
|
54 | Base repo: | |
55 |
|
55 | |||
@@ -82,7 +82,7 b' Base repo:' | |||||
82 | o 0 d57206cc072a: r0 |
|
82 | o 0 d57206cc072a: r0 | |
83 |
|
83 | |||
84 | $ cd .. |
|
84 | $ cd .. | |
85 | $ start main |
|
85 | $ tstart main | |
86 |
|
86 | |||
87 | Full clone: |
|
87 | Full clone: | |
88 |
|
88 | |||
@@ -199,7 +199,7 b' Local is subset:' | |||||
199 |
|
199 | |||
200 | Remote is empty: |
|
200 | Remote is empty: | |
201 |
|
201 | |||
202 | $ stop ; start empty2 |
|
202 | $ tstop ; tstart empty2 | |
203 | $ cd main |
|
203 | $ cd main | |
204 | $ hg incoming $remote |
|
204 | $ hg incoming $remote | |
205 | comparing with http://localhost:$HGPORT/ |
|
205 | comparing with http://localhost:$HGPORT/ | |
@@ -241,7 +241,7 b' Remote is empty:' | |||||
241 |
|
241 | |||
242 | Local is superset: |
|
242 | Local is superset: | |
243 |
|
243 | |||
244 | $ stop |
|
244 | $ tstop | |
245 | $ hg clone main subset2 --rev name2 |
|
245 | $ hg clone main subset2 --rev name2 | |
246 | adding changesets |
|
246 | adding changesets | |
247 | adding manifests |
|
247 | adding manifests | |
@@ -249,7 +249,7 b' Local is superset:' | |||||
249 | added 6 changesets with 12 changes to 2 files |
|
249 | added 6 changesets with 12 changes to 2 files | |
250 | updating to branch name2 |
|
250 | updating to branch name2 | |
251 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
251 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
252 | $ start subset2 |
|
252 | $ tstart subset2 | |
253 | $ cd main |
|
253 | $ cd main | |
254 | $ hg incoming $remote |
|
254 | $ hg incoming $remote | |
255 | comparing with http://localhost:$HGPORT/ |
|
255 | comparing with http://localhost:$HGPORT/ | |
@@ -291,7 +291,7 b' Local is superset:' | |||||
291 |
|
291 | |||
292 | Partial pull: |
|
292 | Partial pull: | |
293 |
|
293 | |||
294 | $ stop ; start main |
|
294 | $ tstop ; tstart main | |
295 | $ hg clone $remote partial --rev name2 |
|
295 | $ hg clone $remote partial --rev name2 | |
296 | abort: partial pull cannot be done because other repository doesn't support changegroupsubset. |
|
296 | abort: partial pull cannot be done because other repository doesn't support changegroupsubset. | |
297 | [255] |
|
297 | [255] | |
@@ -306,5 +306,5 b' Partial pull:' | |||||
306 | [255] |
|
306 | [255] | |
307 | $ cd .. |
|
307 | $ cd .. | |
308 |
|
308 | |||
309 | $ stop |
|
309 | $ tstop | |
310 |
|
310 |
@@ -13,14 +13,14 b' Setup HTTP server control:' | |||||
13 |
|
13 | |||
14 | $ remote=http://localhost:$HGPORT/ |
|
14 | $ remote=http://localhost:$HGPORT/ | |
15 | $ export remote |
|
15 | $ export remote | |
16 | $ start() { |
|
16 | $ tstart() { | |
17 | > echo '[web]' > $1/.hg/hgrc |
|
17 | > echo '[web]' > $1/.hg/hgrc | |
18 | > echo 'push_ssl = false' >> $1/.hg/hgrc |
|
18 | > echo 'push_ssl = false' >> $1/.hg/hgrc | |
19 | > echo 'allow_push = *' >> $1/.hg/hgrc |
|
19 | > echo 'allow_push = *' >> $1/.hg/hgrc | |
20 | > hg serve -R $1 -p $HGPORT -d --pid-file=hg.pid -E errors.log |
|
20 | > hg serve -R $1 -p $HGPORT -d --pid-file=hg.pid -E errors.log | |
21 | > cat hg.pid >> $DAEMON_PIDS |
|
21 | > cat hg.pid >> $DAEMON_PIDS | |
22 | > } |
|
22 | > } | |
23 | $ stop() { |
|
23 | $ tstop() { | |
24 | > "$TESTDIR/killdaemons.py" |
|
24 | > "$TESTDIR/killdaemons.py" | |
25 | > } |
|
25 | > } | |
26 |
|
26 | |||
@@ -28,7 +28,7 b' Both are empty:' | |||||
28 |
|
28 | |||
29 | $ hg init empty1 |
|
29 | $ hg init empty1 | |
30 | $ hg init empty2 |
|
30 | $ hg init empty2 | |
31 | $ start empty2 |
|
31 | $ tstart empty2 | |
32 | $ hg incoming -R empty1 $remote |
|
32 | $ hg incoming -R empty1 $remote | |
33 | comparing with http://localhost:$HGPORT/ |
|
33 | comparing with http://localhost:$HGPORT/ | |
34 | no changes found |
|
34 | no changes found | |
@@ -43,7 +43,7 b' Both are empty:' | |||||
43 | $ hg push -R empty1 $remote |
|
43 | $ hg push -R empty1 $remote | |
44 | pushing to http://localhost:$HGPORT/ |
|
44 | pushing to http://localhost:$HGPORT/ | |
45 | no changes found |
|
45 | no changes found | |
46 | $ stop |
|
46 | $ tstop | |
47 |
|
47 | |||
48 | Base repo: |
|
48 | Base repo: | |
49 |
|
49 | |||
@@ -76,7 +76,7 b' Base repo:' | |||||
76 | o 0 d57206cc072a: r0 |
|
76 | o 0 d57206cc072a: r0 | |
77 |
|
77 | |||
78 | $ cd .. |
|
78 | $ cd .. | |
79 | $ start main |
|
79 | $ tstart main | |
80 |
|
80 | |||
81 | Full clone: |
|
81 | Full clone: | |
82 |
|
82 | |||
@@ -187,7 +187,7 b' Local is subset:' | |||||
187 |
|
187 | |||
188 | Remote is empty: |
|
188 | Remote is empty: | |
189 |
|
189 | |||
190 | $ stop ; start empty2 |
|
190 | $ tstop ; tstart empty2 | |
191 | $ cd main |
|
191 | $ cd main | |
192 | $ hg incoming $remote |
|
192 | $ hg incoming $remote | |
193 | comparing with http://localhost:$HGPORT/ |
|
193 | comparing with http://localhost:$HGPORT/ | |
@@ -229,7 +229,7 b' Remote is empty:' | |||||
229 |
|
229 | |||
230 | Local is superset: |
|
230 | Local is superset: | |
231 |
|
231 | |||
232 | $ stop |
|
232 | $ tstop | |
233 | $ hg clone main subset2 --rev name2 |
|
233 | $ hg clone main subset2 --rev name2 | |
234 | adding changesets |
|
234 | adding changesets | |
235 | adding manifests |
|
235 | adding manifests | |
@@ -237,7 +237,7 b' Local is superset:' | |||||
237 | added 6 changesets with 12 changes to 2 files |
|
237 | added 6 changesets with 12 changes to 2 files | |
238 | updating to branch name2 |
|
238 | updating to branch name2 | |
239 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
239 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
240 | $ start subset2 |
|
240 | $ tstart subset2 | |
241 | $ cd main |
|
241 | $ cd main | |
242 | $ hg incoming $remote |
|
242 | $ hg incoming $remote | |
243 | comparing with http://localhost:$HGPORT/ |
|
243 | comparing with http://localhost:$HGPORT/ | |
@@ -279,7 +279,7 b' Local is superset:' | |||||
279 |
|
279 | |||
280 | Partial pull: |
|
280 | Partial pull: | |
281 |
|
281 | |||
282 | $ stop ; start main |
|
282 | $ tstop ; tstart main | |
283 | $ hg clone $remote partial --rev name2 |
|
283 | $ hg clone $remote partial --rev name2 | |
284 | adding changesets |
|
284 | adding changesets | |
285 | adding manifests |
|
285 | adding manifests | |
@@ -321,12 +321,12 b' Partial pull:' | |||||
321 |
|
321 | |||
322 | Both have new stuff in new named branches: |
|
322 | Both have new stuff in new named branches: | |
323 |
|
323 | |||
324 | $ stop |
|
324 | $ tstop | |
325 | $ hg clone main repo1a --rev name1 -q |
|
325 | $ hg clone main repo1a --rev name1 -q | |
326 | $ hg clone repo1a repo1b -q |
|
326 | $ hg clone repo1a repo1b -q | |
327 | $ hg clone main repo2a --rev name2 -q |
|
327 | $ hg clone main repo2a --rev name2 -q | |
328 | $ hg clone repo2a repo2b -q |
|
328 | $ hg clone repo2a repo2b -q | |
329 | $ start repo1a |
|
329 | $ tstart repo1a | |
330 |
|
330 | |||
331 | $ cd repo2a |
|
331 | $ cd repo2a | |
332 | $ hg incoming $remote |
|
332 | $ hg incoming $remote | |
@@ -369,7 +369,7 b' Both have new stuff in new named branche' | |||||
369 | [1] |
|
369 | [1] | |
370 | $ cd .. |
|
370 | $ cd .. | |
371 |
|
371 | |||
372 | $ stop ; start repo1b |
|
372 | $ tstop ; tstart repo1b | |
373 | $ cd repo2b |
|
373 | $ cd repo2b | |
374 | $ hg incoming $remote |
|
374 | $ hg incoming $remote | |
375 | comparing with http://localhost:$HGPORT/ |
|
375 | comparing with http://localhost:$HGPORT/ | |
@@ -413,13 +413,13 b' Both have new stuff in new named branche' | |||||
413 |
|
413 | |||
414 | Both have new stuff in existing named branches: |
|
414 | Both have new stuff in existing named branches: | |
415 |
|
415 | |||
416 | $ stop |
|
416 | $ tstop | |
417 | $ rm -r repo1a repo1b repo2a repo2b |
|
417 | $ rm -r repo1a repo1b repo2a repo2b | |
418 | $ hg clone main repo1a --rev 3 --rev 8 -q |
|
418 | $ hg clone main repo1a --rev 3 --rev 8 -q | |
419 | $ hg clone repo1a repo1b -q |
|
419 | $ hg clone repo1a repo1b -q | |
420 | $ hg clone main repo2a --rev 4 --rev 7 -q |
|
420 | $ hg clone main repo2a --rev 4 --rev 7 -q | |
421 | $ hg clone repo2a repo2b -q |
|
421 | $ hg clone repo2a repo2b -q | |
422 | $ start repo1a |
|
422 | $ tstart repo1a | |
423 |
|
423 | |||
424 | $ cd repo2a |
|
424 | $ cd repo2a | |
425 | $ hg incoming $remote |
|
425 | $ hg incoming $remote | |
@@ -457,7 +457,7 b' Both have new stuff in existing named br' | |||||
457 | [1] |
|
457 | [1] | |
458 | $ cd .. |
|
458 | $ cd .. | |
459 |
|
459 | |||
460 | $ stop ; start repo1b |
|
460 | $ tstop ; tstart repo1b | |
461 | $ cd repo2b |
|
461 | $ cd repo2b | |
462 | $ hg incoming $remote |
|
462 | $ hg incoming $remote | |
463 | comparing with http://localhost:$HGPORT/ |
|
463 | comparing with http://localhost:$HGPORT/ | |
@@ -494,5 +494,5 b' Both have new stuff in existing named br' | |||||
494 | [1] |
|
494 | [1] | |
495 | $ cd .. |
|
495 | $ cd .. | |
496 |
|
496 | |||
497 | $ stop |
|
497 | $ tstop | |
498 |
|
498 |
General Comments 0
You need to be logged in to leave comments.
Login now