Show More
@@ -365,6 +365,7 b' class sshv1peer(wireproto.wirepeer):' | |||||
365 | self._pipei = stdout |
|
365 | self._pipei = stdout | |
366 | self._pipee = stderr |
|
366 | self._pipee = stderr | |
367 | self._caps = caps |
|
367 | self._caps = caps | |
|
368 | self._autoreadstderr = autoreadstderr | |||
368 |
|
369 | |||
369 | # Commands that have a "framed" response where the first line of the |
|
370 | # Commands that have a "framed" response where the first line of the | |
370 | # response contains the length of that response. |
|
371 | # response contains the length of that response. | |
@@ -510,10 +511,12 b' class sshv1peer(wireproto.wirepeer):' | |||||
510 | def _getamount(self): |
|
511 | def _getamount(self): | |
511 | l = self._pipei.readline() |
|
512 | l = self._pipei.readline() | |
512 | if l == '\n': |
|
513 | if l == '\n': | |
513 |
self._ |
|
514 | if self._autoreadstderr: | |
|
515 | self._readerr() | |||
514 | msg = _('check previous remote output') |
|
516 | msg = _('check previous remote output') | |
515 | self._abort(error.OutOfBandError(hint=msg)) |
|
517 | self._abort(error.OutOfBandError(hint=msg)) | |
516 |
self._ |
|
518 | if self._autoreadstderr: | |
|
519 | self._readerr() | |||
517 | try: |
|
520 | try: | |
518 | return int(l) |
|
521 | return int(l) | |
519 | except ValueError: |
|
522 | except ValueError: | |
@@ -528,7 +531,8 b' class sshv1peer(wireproto.wirepeer):' | |||||
528 | self._pipeo.write(data) |
|
531 | self._pipeo.write(data) | |
529 | if flush: |
|
532 | if flush: | |
530 | self._pipeo.flush() |
|
533 | self._pipeo.flush() | |
531 |
self._ |
|
534 | if self._autoreadstderr: | |
|
535 | self._readerr() | |||
532 |
|
536 | |||
533 | class sshv2peer(sshv1peer): |
|
537 | class sshv2peer(sshv1peer): | |
534 | """A peer that speakers version 2 of the transport protocol.""" |
|
538 | """A peer that speakers version 2 of the transport protocol.""" |
@@ -45,6 +45,7 b' Test pushing bundle1 payload to a server' | |||||
45 | > # This is "force" in hex. |
|
45 | > # This is "force" in hex. | |
46 | > heads 666f726365 |
|
46 | > heads 666f726365 | |
47 | > PUSHFILE ../initial.v1.hg |
|
47 | > PUSHFILE ../initial.v1.hg | |
|
48 | > readavailable | |||
48 | > EOF |
|
49 | > EOF | |
49 | testing ssh1 |
|
50 | testing ssh1 | |
50 | creating ssh peer from handshake results |
|
51 | creating ssh peer from handshake results | |
@@ -87,17 +88,15 b' Test pushing bundle1 payload to a server' | |||||
87 | i> flush() -> None |
|
88 | i> flush() -> None | |
88 | o> readline() -> 2: |
|
89 | o> readline() -> 2: | |
89 | o> 0\n |
|
90 | o> 0\n | |
90 | e> read(-1) -> 115: |
|
|||
91 | e> abort: incompatible Mercurial client; bundle2 required\n |
|
|||
92 | e> (see https://www.mercurial-scm.org/wiki/IncompatibleClient)\n |
|
|||
93 | remote: abort: incompatible Mercurial client; bundle2 required |
|
|||
94 | remote: (see https://www.mercurial-scm.org/wiki/IncompatibleClient) |
|
|||
95 | o> read(0) -> 0: |
|
91 | o> read(0) -> 0: | |
96 | o> readline() -> 2: |
|
92 | o> readline() -> 2: | |
97 | o> 1\n |
|
93 | o> 1\n | |
98 | o> read(1) -> 1: 0 |
|
94 | o> read(1) -> 1: 0 | |
99 | result: 0 |
|
95 | result: 0 | |
100 | remote output: |
|
96 | remote output: | |
|
97 | e> read(-1) -> 115: | |||
|
98 | e> abort: incompatible Mercurial client; bundle2 required\n | |||
|
99 | e> (see https://www.mercurial-scm.org/wiki/IncompatibleClient)\n | |||
101 |
|
100 | |||
102 | testing ssh2 |
|
101 | testing ssh2 | |
103 | creating ssh peer from handshake results |
|
102 | creating ssh peer from handshake results | |
@@ -140,17 +139,15 b' Test pushing bundle1 payload to a server' | |||||
140 | i> flush() -> None |
|
139 | i> flush() -> None | |
141 | o> readline() -> 2: |
|
140 | o> readline() -> 2: | |
142 | o> 0\n |
|
141 | o> 0\n | |
143 | e> read(-1) -> 115: |
|
|||
144 | e> abort: incompatible Mercurial client; bundle2 required\n |
|
|||
145 | e> (see https://www.mercurial-scm.org/wiki/IncompatibleClient)\n |
|
|||
146 | remote: abort: incompatible Mercurial client; bundle2 required |
|
|||
147 | remote: (see https://www.mercurial-scm.org/wiki/IncompatibleClient) |
|
|||
148 | o> read(0) -> 0: |
|
142 | o> read(0) -> 0: | |
149 | o> readline() -> 2: |
|
143 | o> readline() -> 2: | |
150 | o> 1\n |
|
144 | o> 1\n | |
151 | o> read(1) -> 1: 0 |
|
145 | o> read(1) -> 1: 0 | |
152 | result: 0 |
|
146 | result: 0 | |
153 | remote output: |
|
147 | remote output: | |
|
148 | e> read(-1) -> 115: | |||
|
149 | e> abort: incompatible Mercurial client; bundle2 required\n | |||
|
150 | e> (see https://www.mercurial-scm.org/wiki/IncompatibleClient)\n | |||
154 |
|
151 | |||
155 | $ cd .. |
|
152 | $ cd .. | |
156 |
|
153 | |||
@@ -217,6 +214,7 b' ui.write() in hook is redirected to stde' | |||||
217 | > # This is "force" in hex. |
|
214 | > # This is "force" in hex. | |
218 | > heads 666f726365 |
|
215 | > heads 666f726365 | |
219 | > PUSHFILE ../initial.v1.hg |
|
216 | > PUSHFILE ../initial.v1.hg | |
|
217 | > readavailable | |||
220 | > EOF |
|
218 | > EOF | |
221 | testing ssh1 |
|
219 | testing ssh1 | |
222 | creating ssh peer from handshake results |
|
220 | creating ssh peer from handshake results | |
@@ -259,6 +257,12 b' ui.write() in hook is redirected to stde' | |||||
259 | i> flush() -> None |
|
257 | i> flush() -> None | |
260 | o> readline() -> 2: |
|
258 | o> readline() -> 2: | |
261 | o> 0\n |
|
259 | o> 0\n | |
|
260 | o> read(0) -> 0: | |||
|
261 | o> readline() -> 2: | |||
|
262 | o> 1\n | |||
|
263 | o> read(1) -> 1: 0 | |||
|
264 | result: 0 | |||
|
265 | remote output: | |||
262 | e> read(-1) -> 196: |
|
266 | e> read(-1) -> 196: | |
263 | e> adding changesets\n |
|
267 | e> adding changesets\n | |
264 | e> adding manifests\n |
|
268 | e> adding manifests\n | |
@@ -268,20 +272,6 b' ui.write() in hook is redirected to stde' | |||||
268 | e> transaction abort!\n |
|
272 | e> transaction abort!\n | |
269 | e> rollback completed\n |
|
273 | e> rollback completed\n | |
270 | e> abort: pretxnchangegroup.fail hook failed\n |
|
274 | e> abort: pretxnchangegroup.fail hook failed\n | |
271 | remote: adding changesets |
|
|||
272 | remote: adding manifests |
|
|||
273 | remote: adding file changes |
|
|||
274 | remote: added 1 changesets with 1 changes to 1 files |
|
|||
275 | remote: ui.write 1 line |
|
|||
276 | remote: transaction abort! |
|
|||
277 | remote: rollback completed |
|
|||
278 | remote: abort: pretxnchangegroup.fail hook failed |
|
|||
279 | o> read(0) -> 0: |
|
|||
280 | o> readline() -> 2: |
|
|||
281 | o> 1\n |
|
|||
282 | o> read(1) -> 1: 0 |
|
|||
283 | result: 0 |
|
|||
284 | remote output: |
|
|||
285 |
|
275 | |||
286 | testing ssh2 |
|
276 | testing ssh2 | |
287 | creating ssh peer from handshake results |
|
277 | creating ssh peer from handshake results | |
@@ -324,6 +314,12 b' ui.write() in hook is redirected to stde' | |||||
324 | i> flush() -> None |
|
314 | i> flush() -> None | |
325 | o> readline() -> 2: |
|
315 | o> readline() -> 2: | |
326 | o> 0\n |
|
316 | o> 0\n | |
|
317 | o> read(0) -> 0: | |||
|
318 | o> readline() -> 2: | |||
|
319 | o> 1\n | |||
|
320 | o> read(1) -> 1: 0 | |||
|
321 | result: 0 | |||
|
322 | remote output: | |||
327 | e> read(-1) -> 196: |
|
323 | e> read(-1) -> 196: | |
328 | e> adding changesets\n |
|
324 | e> adding changesets\n | |
329 | e> adding manifests\n |
|
325 | e> adding manifests\n | |
@@ -333,20 +329,6 b' ui.write() in hook is redirected to stde' | |||||
333 | e> transaction abort!\n |
|
329 | e> transaction abort!\n | |
334 | e> rollback completed\n |
|
330 | e> rollback completed\n | |
335 | e> abort: pretxnchangegroup.fail hook failed\n |
|
331 | e> abort: pretxnchangegroup.fail hook failed\n | |
336 | remote: adding changesets |
|
|||
337 | remote: adding manifests |
|
|||
338 | remote: adding file changes |
|
|||
339 | remote: added 1 changesets with 1 changes to 1 files |
|
|||
340 | remote: ui.write 1 line |
|
|||
341 | remote: transaction abort! |
|
|||
342 | remote: rollback completed |
|
|||
343 | remote: abort: pretxnchangegroup.fail hook failed |
|
|||
344 | o> read(0) -> 0: |
|
|||
345 | o> readline() -> 2: |
|
|||
346 | o> 1\n |
|
|||
347 | o> read(1) -> 1: 0 |
|
|||
348 | result: 0 |
|
|||
349 | remote output: |
|
|||
350 |
|
332 | |||
351 | And a variation that writes multiple lines using ui.write |
|
333 | And a variation that writes multiple lines using ui.write | |
352 |
|
334 | |||
@@ -360,6 +342,7 b' And a variation that writes multiple lin' | |||||
360 | > # This is "force" in hex. |
|
342 | > # This is "force" in hex. | |
361 | > heads 666f726365 |
|
343 | > heads 666f726365 | |
362 | > PUSHFILE ../initial.v1.hg |
|
344 | > PUSHFILE ../initial.v1.hg | |
|
345 | > readavailable | |||
363 | > EOF |
|
346 | > EOF | |
364 | testing ssh1 |
|
347 | testing ssh1 | |
365 | creating ssh peer from handshake results |
|
348 | creating ssh peer from handshake results | |
@@ -402,6 +385,12 b' And a variation that writes multiple lin' | |||||
402 | i> flush() -> None |
|
385 | i> flush() -> None | |
403 | o> readline() -> 2: |
|
386 | o> readline() -> 2: | |
404 | o> 0\n |
|
387 | o> 0\n | |
|
388 | o> read(0) -> 0: | |||
|
389 | o> readline() -> 2: | |||
|
390 | o> 1\n | |||
|
391 | o> read(1) -> 1: 0 | |||
|
392 | result: 0 | |||
|
393 | remote output: | |||
405 | e> read(-1) -> 218: |
|
394 | e> read(-1) -> 218: | |
406 | e> adding changesets\n |
|
395 | e> adding changesets\n | |
407 | e> adding manifests\n |
|
396 | e> adding manifests\n | |
@@ -412,21 +401,6 b' And a variation that writes multiple lin' | |||||
412 | e> transaction abort!\n |
|
401 | e> transaction abort!\n | |
413 | e> rollback completed\n |
|
402 | e> rollback completed\n | |
414 | e> abort: pretxnchangegroup.fail hook failed\n |
|
403 | e> abort: pretxnchangegroup.fail hook failed\n | |
415 | remote: adding changesets |
|
|||
416 | remote: adding manifests |
|
|||
417 | remote: adding file changes |
|
|||
418 | remote: added 1 changesets with 1 changes to 1 files |
|
|||
419 | remote: ui.write 2 lines 1 |
|
|||
420 | remote: ui.write 2 lines 2 |
|
|||
421 | remote: transaction abort! |
|
|||
422 | remote: rollback completed |
|
|||
423 | remote: abort: pretxnchangegroup.fail hook failed |
|
|||
424 | o> read(0) -> 0: |
|
|||
425 | o> readline() -> 2: |
|
|||
426 | o> 1\n |
|
|||
427 | o> read(1) -> 1: 0 |
|
|||
428 | result: 0 |
|
|||
429 | remote output: |
|
|||
430 |
|
404 | |||
431 | testing ssh2 |
|
405 | testing ssh2 | |
432 | creating ssh peer from handshake results |
|
406 | creating ssh peer from handshake results | |
@@ -469,6 +443,12 b' And a variation that writes multiple lin' | |||||
469 | i> flush() -> None |
|
443 | i> flush() -> None | |
470 | o> readline() -> 2: |
|
444 | o> readline() -> 2: | |
471 | o> 0\n |
|
445 | o> 0\n | |
|
446 | o> read(0) -> 0: | |||
|
447 | o> readline() -> 2: | |||
|
448 | o> 1\n | |||
|
449 | o> read(1) -> 1: 0 | |||
|
450 | result: 0 | |||
|
451 | remote output: | |||
472 | e> read(-1) -> 218: |
|
452 | e> read(-1) -> 218: | |
473 | e> adding changesets\n |
|
453 | e> adding changesets\n | |
474 | e> adding manifests\n |
|
454 | e> adding manifests\n | |
@@ -479,21 +459,6 b' And a variation that writes multiple lin' | |||||
479 | e> transaction abort!\n |
|
459 | e> transaction abort!\n | |
480 | e> rollback completed\n |
|
460 | e> rollback completed\n | |
481 | e> abort: pretxnchangegroup.fail hook failed\n |
|
461 | e> abort: pretxnchangegroup.fail hook failed\n | |
482 | remote: adding changesets |
|
|||
483 | remote: adding manifests |
|
|||
484 | remote: adding file changes |
|
|||
485 | remote: added 1 changesets with 1 changes to 1 files |
|
|||
486 | remote: ui.write 2 lines 1 |
|
|||
487 | remote: ui.write 2 lines 2 |
|
|||
488 | remote: transaction abort! |
|
|||
489 | remote: rollback completed |
|
|||
490 | remote: abort: pretxnchangegroup.fail hook failed |
|
|||
491 | o> read(0) -> 0: |
|
|||
492 | o> readline() -> 2: |
|
|||
493 | o> 1\n |
|
|||
494 | o> read(1) -> 1: 0 |
|
|||
495 | result: 0 |
|
|||
496 | remote output: |
|
|||
497 |
|
462 | |||
498 | And a variation that does a ui.flush() after writing output |
|
463 | And a variation that does a ui.flush() after writing output | |
499 |
|
464 | |||
@@ -507,6 +472,7 b' And a variation that does a ui.flush() a' | |||||
507 | > # This is "force" in hex. |
|
472 | > # This is "force" in hex. | |
508 | > heads 666f726365 |
|
473 | > heads 666f726365 | |
509 | > PUSHFILE ../initial.v1.hg |
|
474 | > PUSHFILE ../initial.v1.hg | |
|
475 | > readavailable | |||
510 | > EOF |
|
476 | > EOF | |
511 | testing ssh1 |
|
477 | testing ssh1 | |
512 | creating ssh peer from handshake results |
|
478 | creating ssh peer from handshake results | |
@@ -549,6 +515,12 b' And a variation that does a ui.flush() a' | |||||
549 | i> flush() -> None |
|
515 | i> flush() -> None | |
550 | o> readline() -> 2: |
|
516 | o> readline() -> 2: | |
551 | o> 0\n |
|
517 | o> 0\n | |
|
518 | o> read(0) -> 0: | |||
|
519 | o> readline() -> 2: | |||
|
520 | o> 1\n | |||
|
521 | o> read(1) -> 1: 0 | |||
|
522 | result: 0 | |||
|
523 | remote output: | |||
552 | e> read(-1) -> 202: |
|
524 | e> read(-1) -> 202: | |
553 | e> adding changesets\n |
|
525 | e> adding changesets\n | |
554 | e> adding manifests\n |
|
526 | e> adding manifests\n | |
@@ -558,20 +530,6 b' And a variation that does a ui.flush() a' | |||||
558 | e> transaction abort!\n |
|
530 | e> transaction abort!\n | |
559 | e> rollback completed\n |
|
531 | e> rollback completed\n | |
560 | e> abort: pretxnchangegroup.fail hook failed\n |
|
532 | e> abort: pretxnchangegroup.fail hook failed\n | |
561 | remote: adding changesets |
|
|||
562 | remote: adding manifests |
|
|||
563 | remote: adding file changes |
|
|||
564 | remote: added 1 changesets with 1 changes to 1 files |
|
|||
565 | remote: ui.write 1 line flush |
|
|||
566 | remote: transaction abort! |
|
|||
567 | remote: rollback completed |
|
|||
568 | remote: abort: pretxnchangegroup.fail hook failed |
|
|||
569 | o> read(0) -> 0: |
|
|||
570 | o> readline() -> 2: |
|
|||
571 | o> 1\n |
|
|||
572 | o> read(1) -> 1: 0 |
|
|||
573 | result: 0 |
|
|||
574 | remote output: |
|
|||
575 |
|
533 | |||
576 | testing ssh2 |
|
534 | testing ssh2 | |
577 | creating ssh peer from handshake results |
|
535 | creating ssh peer from handshake results | |
@@ -614,6 +572,12 b' And a variation that does a ui.flush() a' | |||||
614 | i> flush() -> None |
|
572 | i> flush() -> None | |
615 | o> readline() -> 2: |
|
573 | o> readline() -> 2: | |
616 | o> 0\n |
|
574 | o> 0\n | |
|
575 | o> read(0) -> 0: | |||
|
576 | o> readline() -> 2: | |||
|
577 | o> 1\n | |||
|
578 | o> read(1) -> 1: 0 | |||
|
579 | result: 0 | |||
|
580 | remote output: | |||
617 | e> read(-1) -> 202: |
|
581 | e> read(-1) -> 202: | |
618 | e> adding changesets\n |
|
582 | e> adding changesets\n | |
619 | e> adding manifests\n |
|
583 | e> adding manifests\n | |
@@ -623,20 +587,6 b' And a variation that does a ui.flush() a' | |||||
623 | e> transaction abort!\n |
|
587 | e> transaction abort!\n | |
624 | e> rollback completed\n |
|
588 | e> rollback completed\n | |
625 | e> abort: pretxnchangegroup.fail hook failed\n |
|
589 | e> abort: pretxnchangegroup.fail hook failed\n | |
626 | remote: adding changesets |
|
|||
627 | remote: adding manifests |
|
|||
628 | remote: adding file changes |
|
|||
629 | remote: added 1 changesets with 1 changes to 1 files |
|
|||
630 | remote: ui.write 1 line flush |
|
|||
631 | remote: transaction abort! |
|
|||
632 | remote: rollback completed |
|
|||
633 | remote: abort: pretxnchangegroup.fail hook failed |
|
|||
634 | o> read(0) -> 0: |
|
|||
635 | o> readline() -> 2: |
|
|||
636 | o> 1\n |
|
|||
637 | o> read(1) -> 1: 0 |
|
|||
638 | result: 0 |
|
|||
639 | remote output: |
|
|||
640 |
|
590 | |||
641 | Multiple writes + flush |
|
591 | Multiple writes + flush | |
642 |
|
592 | |||
@@ -650,6 +600,7 b' Multiple writes + flush' | |||||
650 | > # This is "force" in hex. |
|
600 | > # This is "force" in hex. | |
651 | > heads 666f726365 |
|
601 | > heads 666f726365 | |
652 | > PUSHFILE ../initial.v1.hg |
|
602 | > PUSHFILE ../initial.v1.hg | |
|
603 | > readavailable | |||
653 | > EOF |
|
604 | > EOF | |
654 | testing ssh1 |
|
605 | testing ssh1 | |
655 | creating ssh peer from handshake results |
|
606 | creating ssh peer from handshake results | |
@@ -692,6 +643,12 b' Multiple writes + flush' | |||||
692 | i> flush() -> None |
|
643 | i> flush() -> None | |
693 | o> readline() -> 2: |
|
644 | o> readline() -> 2: | |
694 | o> 0\n |
|
645 | o> 0\n | |
|
646 | o> read(0) -> 0: | |||
|
647 | o> readline() -> 2: | |||
|
648 | o> 1\n | |||
|
649 | o> read(1) -> 1: 0 | |||
|
650 | result: 0 | |||
|
651 | remote output: | |||
695 | e> read(-1) -> 206: |
|
652 | e> read(-1) -> 206: | |
696 | e> adding changesets\n |
|
653 | e> adding changesets\n | |
697 | e> adding manifests\n |
|
654 | e> adding manifests\n | |
@@ -702,21 +659,6 b' Multiple writes + flush' | |||||
702 | e> transaction abort!\n |
|
659 | e> transaction abort!\n | |
703 | e> rollback completed\n |
|
660 | e> rollback completed\n | |
704 | e> abort: pretxnchangegroup.fail hook failed\n |
|
661 | e> abort: pretxnchangegroup.fail hook failed\n | |
705 | remote: adding changesets |
|
|||
706 | remote: adding manifests |
|
|||
707 | remote: adding file changes |
|
|||
708 | remote: added 1 changesets with 1 changes to 1 files |
|
|||
709 | remote: ui.write 1st |
|
|||
710 | remote: ui.write 2nd |
|
|||
711 | remote: transaction abort! |
|
|||
712 | remote: rollback completed |
|
|||
713 | remote: abort: pretxnchangegroup.fail hook failed |
|
|||
714 | o> read(0) -> 0: |
|
|||
715 | o> readline() -> 2: |
|
|||
716 | o> 1\n |
|
|||
717 | o> read(1) -> 1: 0 |
|
|||
718 | result: 0 |
|
|||
719 | remote output: |
|
|||
720 |
|
662 | |||
721 | testing ssh2 |
|
663 | testing ssh2 | |
722 | creating ssh peer from handshake results |
|
664 | creating ssh peer from handshake results | |
@@ -759,6 +701,12 b' Multiple writes + flush' | |||||
759 | i> flush() -> None |
|
701 | i> flush() -> None | |
760 | o> readline() -> 2: |
|
702 | o> readline() -> 2: | |
761 | o> 0\n |
|
703 | o> 0\n | |
|
704 | o> read(0) -> 0: | |||
|
705 | o> readline() -> 2: | |||
|
706 | o> 1\n | |||
|
707 | o> read(1) -> 1: 0 | |||
|
708 | result: 0 | |||
|
709 | remote output: | |||
762 | e> read(-1) -> 206: |
|
710 | e> read(-1) -> 206: | |
763 | e> adding changesets\n |
|
711 | e> adding changesets\n | |
764 | e> adding manifests\n |
|
712 | e> adding manifests\n | |
@@ -769,21 +717,6 b' Multiple writes + flush' | |||||
769 | e> transaction abort!\n |
|
717 | e> transaction abort!\n | |
770 | e> rollback completed\n |
|
718 | e> rollback completed\n | |
771 | e> abort: pretxnchangegroup.fail hook failed\n |
|
719 | e> abort: pretxnchangegroup.fail hook failed\n | |
772 | remote: adding changesets |
|
|||
773 | remote: adding manifests |
|
|||
774 | remote: adding file changes |
|
|||
775 | remote: added 1 changesets with 1 changes to 1 files |
|
|||
776 | remote: ui.write 1st |
|
|||
777 | remote: ui.write 2nd |
|
|||
778 | remote: transaction abort! |
|
|||
779 | remote: rollback completed |
|
|||
780 | remote: abort: pretxnchangegroup.fail hook failed |
|
|||
781 | o> read(0) -> 0: |
|
|||
782 | o> readline() -> 2: |
|
|||
783 | o> 1\n |
|
|||
784 | o> read(1) -> 1: 0 |
|
|||
785 | result: 0 |
|
|||
786 | remote output: |
|
|||
787 |
|
720 | |||
788 | ui.write() + ui.write_err() output is captured |
|
721 | ui.write() + ui.write_err() output is captured | |
789 |
|
722 | |||
@@ -797,6 +730,7 b' ui.write() + ui.write_err() output is ca' | |||||
797 | > # This is "force" in hex. |
|
730 | > # This is "force" in hex. | |
798 | > heads 666f726365 |
|
731 | > heads 666f726365 | |
799 | > PUSHFILE ../initial.v1.hg |
|
732 | > PUSHFILE ../initial.v1.hg | |
|
733 | > readavailable | |||
800 | > EOF |
|
734 | > EOF | |
801 | testing ssh1 |
|
735 | testing ssh1 | |
802 | creating ssh peer from handshake results |
|
736 | creating ssh peer from handshake results | |
@@ -839,6 +773,12 b' ui.write() + ui.write_err() output is ca' | |||||
839 | i> flush() -> None |
|
773 | i> flush() -> None | |
840 | o> readline() -> 2: |
|
774 | o> readline() -> 2: | |
841 | o> 0\n |
|
775 | o> 0\n | |
|
776 | o> read(0) -> 0: | |||
|
777 | o> readline() -> 2: | |||
|
778 | o> 1\n | |||
|
779 | o> read(1) -> 1: 0 | |||
|
780 | result: 0 | |||
|
781 | remote output: | |||
842 | e> read(-1) -> 232: |
|
782 | e> read(-1) -> 232: | |
843 | e> adding changesets\n |
|
783 | e> adding changesets\n | |
844 | e> adding manifests\n |
|
784 | e> adding manifests\n | |
@@ -851,23 +791,6 b' ui.write() + ui.write_err() output is ca' | |||||
851 | e> transaction abort!\n |
|
791 | e> transaction abort!\n | |
852 | e> rollback completed\n |
|
792 | e> rollback completed\n | |
853 | e> abort: pretxnchangegroup.fail hook failed\n |
|
793 | e> abort: pretxnchangegroup.fail hook failed\n | |
854 | remote: adding changesets |
|
|||
855 | remote: adding manifests |
|
|||
856 | remote: adding file changes |
|
|||
857 | remote: added 1 changesets with 1 changes to 1 files |
|
|||
858 | remote: ui.write 1 |
|
|||
859 | remote: ui.write_err 1 |
|
|||
860 | remote: ui.write 2 |
|
|||
861 | remote: ui.write_err 2 |
|
|||
862 | remote: transaction abort! |
|
|||
863 | remote: rollback completed |
|
|||
864 | remote: abort: pretxnchangegroup.fail hook failed |
|
|||
865 | o> read(0) -> 0: |
|
|||
866 | o> readline() -> 2: |
|
|||
867 | o> 1\n |
|
|||
868 | o> read(1) -> 1: 0 |
|
|||
869 | result: 0 |
|
|||
870 | remote output: |
|
|||
871 |
|
794 | |||
872 | testing ssh2 |
|
795 | testing ssh2 | |
873 | creating ssh peer from handshake results |
|
796 | creating ssh peer from handshake results | |
@@ -910,6 +833,12 b' ui.write() + ui.write_err() output is ca' | |||||
910 | i> flush() -> None |
|
833 | i> flush() -> None | |
911 | o> readline() -> 2: |
|
834 | o> readline() -> 2: | |
912 | o> 0\n |
|
835 | o> 0\n | |
|
836 | o> read(0) -> 0: | |||
|
837 | o> readline() -> 2: | |||
|
838 | o> 1\n | |||
|
839 | o> read(1) -> 1: 0 | |||
|
840 | result: 0 | |||
|
841 | remote output: | |||
913 | e> read(-1) -> 232: |
|
842 | e> read(-1) -> 232: | |
914 | e> adding changesets\n |
|
843 | e> adding changesets\n | |
915 | e> adding manifests\n |
|
844 | e> adding manifests\n | |
@@ -922,23 +851,6 b' ui.write() + ui.write_err() output is ca' | |||||
922 | e> transaction abort!\n |
|
851 | e> transaction abort!\n | |
923 | e> rollback completed\n |
|
852 | e> rollback completed\n | |
924 | e> abort: pretxnchangegroup.fail hook failed\n |
|
853 | e> abort: pretxnchangegroup.fail hook failed\n | |
925 | remote: adding changesets |
|
|||
926 | remote: adding manifests |
|
|||
927 | remote: adding file changes |
|
|||
928 | remote: added 1 changesets with 1 changes to 1 files |
|
|||
929 | remote: ui.write 1 |
|
|||
930 | remote: ui.write_err 1 |
|
|||
931 | remote: ui.write 2 |
|
|||
932 | remote: ui.write_err 2 |
|
|||
933 | remote: transaction abort! |
|
|||
934 | remote: rollback completed |
|
|||
935 | remote: abort: pretxnchangegroup.fail hook failed |
|
|||
936 | o> read(0) -> 0: |
|
|||
937 | o> readline() -> 2: |
|
|||
938 | o> 1\n |
|
|||
939 | o> read(1) -> 1: 0 |
|
|||
940 | result: 0 |
|
|||
941 | remote output: |
|
|||
942 |
|
854 | |||
943 | print() output is captured |
|
855 | print() output is captured | |
944 |
|
856 | |||
@@ -952,6 +864,7 b' print() output is captured' | |||||
952 | > # This is "force" in hex. |
|
864 | > # This is "force" in hex. | |
953 | > heads 666f726365 |
|
865 | > heads 666f726365 | |
954 | > PUSHFILE ../initial.v1.hg |
|
866 | > PUSHFILE ../initial.v1.hg | |
|
867 | > readavailable | |||
955 | > EOF |
|
868 | > EOF | |
956 | testing ssh1 |
|
869 | testing ssh1 | |
957 | creating ssh peer from handshake results |
|
870 | creating ssh peer from handshake results | |
@@ -994,6 +907,12 b' print() output is captured' | |||||
994 | i> flush() -> None |
|
907 | i> flush() -> None | |
995 | o> readline() -> 2: |
|
908 | o> readline() -> 2: | |
996 | o> 0\n |
|
909 | o> 0\n | |
|
910 | o> read(0) -> 0: | |||
|
911 | o> readline() -> 2: | |||
|
912 | o> 1\n | |||
|
913 | o> read(1) -> 1: 0 | |||
|
914 | result: 0 | |||
|
915 | remote output: | |||
997 | e> read(-1) -> 193: |
|
916 | e> read(-1) -> 193: | |
998 | e> adding changesets\n |
|
917 | e> adding changesets\n | |
999 | e> adding manifests\n |
|
918 | e> adding manifests\n | |
@@ -1003,20 +922,6 b' print() output is captured' | |||||
1003 | e> transaction abort!\n |
|
922 | e> transaction abort!\n | |
1004 | e> rollback completed\n |
|
923 | e> rollback completed\n | |
1005 | e> abort: pretxnchangegroup.fail hook failed\n |
|
924 | e> abort: pretxnchangegroup.fail hook failed\n | |
1006 | remote: adding changesets |
|
|||
1007 | remote: adding manifests |
|
|||
1008 | remote: adding file changes |
|
|||
1009 | remote: added 1 changesets with 1 changes to 1 files |
|
|||
1010 | remote: printed line |
|
|||
1011 | remote: transaction abort! |
|
|||
1012 | remote: rollback completed |
|
|||
1013 | remote: abort: pretxnchangegroup.fail hook failed |
|
|||
1014 | o> read(0) -> 0: |
|
|||
1015 | o> readline() -> 2: |
|
|||
1016 | o> 1\n |
|
|||
1017 | o> read(1) -> 1: 0 |
|
|||
1018 | result: 0 |
|
|||
1019 | remote output: |
|
|||
1020 |
|
925 | |||
1021 | testing ssh2 |
|
926 | testing ssh2 | |
1022 | creating ssh peer from handshake results |
|
927 | creating ssh peer from handshake results | |
@@ -1059,6 +964,12 b' print() output is captured' | |||||
1059 | i> flush() -> None |
|
964 | i> flush() -> None | |
1060 | o> readline() -> 2: |
|
965 | o> readline() -> 2: | |
1061 | o> 0\n |
|
966 | o> 0\n | |
|
967 | o> read(0) -> 0: | |||
|
968 | o> readline() -> 2: | |||
|
969 | o> 1\n | |||
|
970 | o> read(1) -> 1: 0 | |||
|
971 | result: 0 | |||
|
972 | remote output: | |||
1062 | e> read(-1) -> 193: |
|
973 | e> read(-1) -> 193: | |
1063 | e> adding changesets\n |
|
974 | e> adding changesets\n | |
1064 | e> adding manifests\n |
|
975 | e> adding manifests\n | |
@@ -1068,20 +979,6 b' print() output is captured' | |||||
1068 | e> transaction abort!\n |
|
979 | e> transaction abort!\n | |
1069 | e> rollback completed\n |
|
980 | e> rollback completed\n | |
1070 | e> abort: pretxnchangegroup.fail hook failed\n |
|
981 | e> abort: pretxnchangegroup.fail hook failed\n | |
1071 | remote: adding changesets |
|
|||
1072 | remote: adding manifests |
|
|||
1073 | remote: adding file changes |
|
|||
1074 | remote: added 1 changesets with 1 changes to 1 files |
|
|||
1075 | remote: printed line |
|
|||
1076 | remote: transaction abort! |
|
|||
1077 | remote: rollback completed |
|
|||
1078 | remote: abort: pretxnchangegroup.fail hook failed |
|
|||
1079 | o> read(0) -> 0: |
|
|||
1080 | o> readline() -> 2: |
|
|||
1081 | o> 1\n |
|
|||
1082 | o> read(1) -> 1: 0 |
|
|||
1083 | result: 0 |
|
|||
1084 | remote output: |
|
|||
1085 |
|
982 | |||
1086 | Mixed print() and ui.write() are both captured |
|
983 | Mixed print() and ui.write() are both captured | |
1087 |
|
984 | |||
@@ -1095,6 +992,7 b' Mixed print() and ui.write() are both ca' | |||||
1095 | > # This is "force" in hex. |
|
992 | > # This is "force" in hex. | |
1096 | > heads 666f726365 |
|
993 | > heads 666f726365 | |
1097 | > PUSHFILE ../initial.v1.hg |
|
994 | > PUSHFILE ../initial.v1.hg | |
|
995 | > readavailable | |||
1098 | > EOF |
|
996 | > EOF | |
1099 | testing ssh1 |
|
997 | testing ssh1 | |
1100 | creating ssh peer from handshake results |
|
998 | creating ssh peer from handshake results | |
@@ -1137,6 +1035,12 b' Mixed print() and ui.write() are both ca' | |||||
1137 | i> flush() -> None |
|
1035 | i> flush() -> None | |
1138 | o> readline() -> 2: |
|
1036 | o> readline() -> 2: | |
1139 | o> 0\n |
|
1037 | o> 0\n | |
|
1038 | o> read(0) -> 0: | |||
|
1039 | o> readline() -> 2: | |||
|
1040 | o> 1\n | |||
|
1041 | o> read(1) -> 1: 0 | |||
|
1042 | result: 0 | |||
|
1043 | remote output: | |||
1140 | e> read(-1) -> 218: |
|
1044 | e> read(-1) -> 218: | |
1141 | e> adding changesets\n |
|
1045 | e> adding changesets\n | |
1142 | e> adding manifests\n |
|
1046 | e> adding manifests\n | |
@@ -1149,23 +1053,6 b' Mixed print() and ui.write() are both ca' | |||||
1149 | e> transaction abort!\n |
|
1053 | e> transaction abort!\n | |
1150 | e> rollback completed\n |
|
1054 | e> rollback completed\n | |
1151 | e> abort: pretxnchangegroup.fail hook failed\n |
|
1055 | e> abort: pretxnchangegroup.fail hook failed\n | |
1152 | remote: adding changesets |
|
|||
1153 | remote: adding manifests |
|
|||
1154 | remote: adding file changes |
|
|||
1155 | remote: added 1 changesets with 1 changes to 1 files |
|
|||
1156 | remote: ui.write 1 |
|
|||
1157 | remote: ui.write 2 |
|
|||
1158 | remote: print 1 |
|
|||
1159 | remote: print 2 |
|
|||
1160 | remote: transaction abort! |
|
|||
1161 | remote: rollback completed |
|
|||
1162 | remote: abort: pretxnchangegroup.fail hook failed |
|
|||
1163 | o> read(0) -> 0: |
|
|||
1164 | o> readline() -> 2: |
|
|||
1165 | o> 1\n |
|
|||
1166 | o> read(1) -> 1: 0 |
|
|||
1167 | result: 0 |
|
|||
1168 | remote output: |
|
|||
1169 |
|
1056 | |||
1170 | testing ssh2 |
|
1057 | testing ssh2 | |
1171 | creating ssh peer from handshake results |
|
1058 | creating ssh peer from handshake results | |
@@ -1208,6 +1095,12 b' Mixed print() and ui.write() are both ca' | |||||
1208 | i> flush() -> None |
|
1095 | i> flush() -> None | |
1209 | o> readline() -> 2: |
|
1096 | o> readline() -> 2: | |
1210 | o> 0\n |
|
1097 | o> 0\n | |
|
1098 | o> read(0) -> 0: | |||
|
1099 | o> readline() -> 2: | |||
|
1100 | o> 1\n | |||
|
1101 | o> read(1) -> 1: 0 | |||
|
1102 | result: 0 | |||
|
1103 | remote output: | |||
1211 | e> read(-1) -> 218: |
|
1104 | e> read(-1) -> 218: | |
1212 | e> adding changesets\n |
|
1105 | e> adding changesets\n | |
1213 | e> adding manifests\n |
|
1106 | e> adding manifests\n | |
@@ -1220,23 +1113,6 b' Mixed print() and ui.write() are both ca' | |||||
1220 | e> transaction abort!\n |
|
1113 | e> transaction abort!\n | |
1221 | e> rollback completed\n |
|
1114 | e> rollback completed\n | |
1222 | e> abort: pretxnchangegroup.fail hook failed\n |
|
1115 | e> abort: pretxnchangegroup.fail hook failed\n | |
1223 | remote: adding changesets |
|
|||
1224 | remote: adding manifests |
|
|||
1225 | remote: adding file changes |
|
|||
1226 | remote: added 1 changesets with 1 changes to 1 files |
|
|||
1227 | remote: ui.write 1 |
|
|||
1228 | remote: ui.write 2 |
|
|||
1229 | remote: print 1 |
|
|||
1230 | remote: print 2 |
|
|||
1231 | remote: transaction abort! |
|
|||
1232 | remote: rollback completed |
|
|||
1233 | remote: abort: pretxnchangegroup.fail hook failed |
|
|||
1234 | o> read(0) -> 0: |
|
|||
1235 | o> readline() -> 2: |
|
|||
1236 | o> 1\n |
|
|||
1237 | o> read(1) -> 1: 0 |
|
|||
1238 | result: 0 |
|
|||
1239 | remote output: |
|
|||
1240 |
|
1116 | |||
1241 | print() to stdout and stderr both get captured |
|
1117 | print() to stdout and stderr both get captured | |
1242 |
|
1118 | |||
@@ -1250,6 +1126,7 b' print() to stdout and stderr both get ca' | |||||
1250 | > # This is "force" in hex. |
|
1126 | > # This is "force" in hex. | |
1251 | > heads 666f726365 |
|
1127 | > heads 666f726365 | |
1252 | > PUSHFILE ../initial.v1.hg |
|
1128 | > PUSHFILE ../initial.v1.hg | |
|
1129 | > readavailable | |||
1253 | > EOF |
|
1130 | > EOF | |
1254 | testing ssh1 |
|
1131 | testing ssh1 | |
1255 | creating ssh peer from handshake results |
|
1132 | creating ssh peer from handshake results | |
@@ -1292,6 +1169,12 b' print() to stdout and stderr both get ca' | |||||
1292 | i> flush() -> None |
|
1169 | i> flush() -> None | |
1293 | o> readline() -> 2: |
|
1170 | o> readline() -> 2: | |
1294 | o> 0\n |
|
1171 | o> 0\n | |
|
1172 | o> read(0) -> 0: | |||
|
1173 | o> readline() -> 2: | |||
|
1174 | o> 1\n | |||
|
1175 | o> read(1) -> 1: 0 | |||
|
1176 | result: 0 | |||
|
1177 | remote output: | |||
1295 | e> read(-1) -> 216: |
|
1178 | e> read(-1) -> 216: | |
1296 | e> adding changesets\n |
|
1179 | e> adding changesets\n | |
1297 | e> adding manifests\n |
|
1180 | e> adding manifests\n | |
@@ -1304,23 +1187,6 b' print() to stdout and stderr both get ca' | |||||
1304 | e> transaction abort!\n |
|
1187 | e> transaction abort!\n | |
1305 | e> rollback completed\n |
|
1188 | e> rollback completed\n | |
1306 | e> abort: pretxnchangegroup.fail hook failed\n |
|
1189 | e> abort: pretxnchangegroup.fail hook failed\n | |
1307 | remote: adding changesets |
|
|||
1308 | remote: adding manifests |
|
|||
1309 | remote: adding file changes |
|
|||
1310 | remote: added 1 changesets with 1 changes to 1 files |
|
|||
1311 | remote: stderr 1 |
|
|||
1312 | remote: stderr 2 |
|
|||
1313 | remote: stdout 1 |
|
|||
1314 | remote: stdout 2 |
|
|||
1315 | remote: transaction abort! |
|
|||
1316 | remote: rollback completed |
|
|||
1317 | remote: abort: pretxnchangegroup.fail hook failed |
|
|||
1318 | o> read(0) -> 0: |
|
|||
1319 | o> readline() -> 2: |
|
|||
1320 | o> 1\n |
|
|||
1321 | o> read(1) -> 1: 0 |
|
|||
1322 | result: 0 |
|
|||
1323 | remote output: |
|
|||
1324 |
|
1190 | |||
1325 | testing ssh2 |
|
1191 | testing ssh2 | |
1326 | creating ssh peer from handshake results |
|
1192 | creating ssh peer from handshake results | |
@@ -1363,6 +1229,12 b' print() to stdout and stderr both get ca' | |||||
1363 | i> flush() -> None |
|
1229 | i> flush() -> None | |
1364 | o> readline() -> 2: |
|
1230 | o> readline() -> 2: | |
1365 | o> 0\n |
|
1231 | o> 0\n | |
|
1232 | o> read(0) -> 0: | |||
|
1233 | o> readline() -> 2: | |||
|
1234 | o> 1\n | |||
|
1235 | o> read(1) -> 1: 0 | |||
|
1236 | result: 0 | |||
|
1237 | remote output: | |||
1366 | e> read(-1) -> 216: |
|
1238 | e> read(-1) -> 216: | |
1367 | e> adding changesets\n |
|
1239 | e> adding changesets\n | |
1368 | e> adding manifests\n |
|
1240 | e> adding manifests\n | |
@@ -1375,23 +1247,6 b' print() to stdout and stderr both get ca' | |||||
1375 | e> transaction abort!\n |
|
1247 | e> transaction abort!\n | |
1376 | e> rollback completed\n |
|
1248 | e> rollback completed\n | |
1377 | e> abort: pretxnchangegroup.fail hook failed\n |
|
1249 | e> abort: pretxnchangegroup.fail hook failed\n | |
1378 | remote: adding changesets |
|
|||
1379 | remote: adding manifests |
|
|||
1380 | remote: adding file changes |
|
|||
1381 | remote: added 1 changesets with 1 changes to 1 files |
|
|||
1382 | remote: stderr 1 |
|
|||
1383 | remote: stderr 2 |
|
|||
1384 | remote: stdout 1 |
|
|||
1385 | remote: stdout 2 |
|
|||
1386 | remote: transaction abort! |
|
|||
1387 | remote: rollback completed |
|
|||
1388 | remote: abort: pretxnchangegroup.fail hook failed |
|
|||
1389 | o> read(0) -> 0: |
|
|||
1390 | o> readline() -> 2: |
|
|||
1391 | o> 1\n |
|
|||
1392 | o> read(1) -> 1: 0 |
|
|||
1393 | result: 0 |
|
|||
1394 | remote output: |
|
|||
1395 |
|
1250 | |||
1396 |
$ |
|
1251 | $ cd .. | |
1397 |
|
1252 | |||
@@ -1405,6 +1260,7 b' Pushing a bundle1 with no output' | |||||
1405 | > # This is "force" in hex. |
|
1260 | > # This is "force" in hex. | |
1406 | > heads 666f726365 |
|
1261 | > heads 666f726365 | |
1407 | > PUSHFILE ../initial.v1.hg |
|
1262 | > PUSHFILE ../initial.v1.hg | |
|
1263 | > readavailable | |||
1408 | > EOF |
|
1264 | > EOF | |
1409 | testing ssh1 |
|
1265 | testing ssh1 | |
1410 | creating ssh peer from handshake results |
|
1266 | creating ssh peer from handshake results | |
@@ -1447,21 +1303,17 b' Pushing a bundle1 with no output' | |||||
1447 | i> flush() -> None |
|
1303 | i> flush() -> None | |
1448 | o> readline() -> 2: |
|
1304 | o> readline() -> 2: | |
1449 | o> 0\n |
|
1305 | o> 0\n | |
1450 | e> read(-1) -> 100: |
|
|||
1451 | e> adding changesets\n |
|
|||
1452 | e> adding manifests\n |
|
|||
1453 | e> adding file changes\n |
|
|||
1454 | e> added 1 changesets with 1 changes to 1 files\n |
|
|||
1455 | remote: adding changesets |
|
|||
1456 | remote: adding manifests |
|
|||
1457 | remote: adding file changes |
|
|||
1458 | remote: added 1 changesets with 1 changes to 1 files |
|
|||
1459 | o> read(0) -> 0: |
|
1306 | o> read(0) -> 0: | |
1460 | o> readline() -> 2: |
|
1307 | o> readline() -> 2: | |
1461 | o> 1\n |
|
1308 | o> 1\n | |
1462 | o> read(1) -> 1: 1 |
|
1309 | o> read(1) -> 1: 1 | |
1463 | result: 1 |
|
1310 | result: 1 | |
1464 | remote output: |
|
1311 | remote output: | |
|
1312 | e> read(-1) -> 100: | |||
|
1313 | e> adding changesets\n | |||
|
1314 | e> adding manifests\n | |||
|
1315 | e> adding file changes\n | |||
|
1316 | e> added 1 changesets with 1 changes to 1 files\n | |||
1465 |
|
1317 | |||
1466 | testing ssh2 |
|
1318 | testing ssh2 | |
1467 | creating ssh peer from handshake results |
|
1319 | creating ssh peer from handshake results | |
@@ -1504,21 +1356,17 b' Pushing a bundle1 with no output' | |||||
1504 | i> flush() -> None |
|
1356 | i> flush() -> None | |
1505 | o> readline() -> 2: |
|
1357 | o> readline() -> 2: | |
1506 | o> 0\n |
|
1358 | o> 0\n | |
1507 | e> read(-1) -> 100: |
|
|||
1508 | e> adding changesets\n |
|
|||
1509 | e> adding manifests\n |
|
|||
1510 | e> adding file changes\n |
|
|||
1511 | e> added 1 changesets with 1 changes to 1 files\n |
|
|||
1512 | remote: adding changesets |
|
|||
1513 | remote: adding manifests |
|
|||
1514 | remote: adding file changes |
|
|||
1515 | remote: added 1 changesets with 1 changes to 1 files |
|
|||
1516 | o> read(0) -> 0: |
|
1359 | o> read(0) -> 0: | |
1517 | o> readline() -> 2: |
|
1360 | o> readline() -> 2: | |
1518 | o> 1\n |
|
1361 | o> 1\n | |
1519 | o> read(1) -> 1: 1 |
|
1362 | o> read(1) -> 1: 1 | |
1520 | result: 1 |
|
1363 | result: 1 | |
1521 | remote output: |
|
1364 | remote output: | |
|
1365 | e> read(-1) -> 100: | |||
|
1366 | e> adding changesets\n | |||
|
1367 | e> adding manifests\n | |||
|
1368 | e> adding file changes\n | |||
|
1369 | e> added 1 changesets with 1 changes to 1 files\n | |||
1522 |
|
1370 | |||
1523 |
$ |
|
1371 | $ cd .. | |
1524 |
|
1372 | |||
@@ -1544,6 +1392,7 b' Pushing a bundle1 with ui.write() and ui' | |||||
1544 | > # This is "force" in hex. |
|
1392 | > # This is "force" in hex. | |
1545 | > heads 666f726365 |
|
1393 | > heads 666f726365 | |
1546 | > PUSHFILE ../initial.v1.hg |
|
1394 | > PUSHFILE ../initial.v1.hg | |
|
1395 | > readavailable | |||
1547 | > EOF |
|
1396 | > EOF | |
1548 | testing ssh1 |
|
1397 | testing ssh1 | |
1549 | creating ssh peer from handshake results |
|
1398 | creating ssh peer from handshake results | |
@@ -1586,6 +1435,12 b' Pushing a bundle1 with ui.write() and ui' | |||||
1586 | i> flush() -> None |
|
1435 | i> flush() -> None | |
1587 | o> readline() -> 2: |
|
1436 | o> readline() -> 2: | |
1588 | o> 0\n |
|
1437 | o> 0\n | |
|
1438 | o> read(0) -> 0: | |||
|
1439 | o> readline() -> 2: | |||
|
1440 | o> 1\n | |||
|
1441 | o> read(1) -> 1: 1 | |||
|
1442 | result: 1 | |||
|
1443 | remote output: | |||
1589 | e> read(-1) -> 152: |
|
1444 | e> read(-1) -> 152: | |
1590 | e> adding changesets\n |
|
1445 | e> adding changesets\n | |
1591 | e> adding manifests\n |
|
1446 | e> adding manifests\n | |
@@ -1595,20 +1450,6 b' Pushing a bundle1 with ui.write() and ui' | |||||
1595 | e> ui.write_err 1\n |
|
1450 | e> ui.write_err 1\n | |
1596 | e> ui.write 2\n |
|
1451 | e> ui.write 2\n | |
1597 | e> ui.write_err 2\n |
|
1452 | e> ui.write_err 2\n | |
1598 | remote: adding changesets |
|
|||
1599 | remote: adding manifests |
|
|||
1600 | remote: adding file changes |
|
|||
1601 | remote: added 1 changesets with 1 changes to 1 files |
|
|||
1602 | remote: ui.write 1 |
|
|||
1603 | remote: ui.write_err 1 |
|
|||
1604 | remote: ui.write 2 |
|
|||
1605 | remote: ui.write_err 2 |
|
|||
1606 | o> read(0) -> 0: |
|
|||
1607 | o> readline() -> 2: |
|
|||
1608 | o> 1\n |
|
|||
1609 | o> read(1) -> 1: 1 |
|
|||
1610 | result: 1 |
|
|||
1611 | remote output: |
|
|||
1612 |
|
1453 | |||
1613 | testing ssh2 |
|
1454 | testing ssh2 | |
1614 | creating ssh peer from handshake results |
|
1455 | creating ssh peer from handshake results | |
@@ -1651,6 +1492,12 b' Pushing a bundle1 with ui.write() and ui' | |||||
1651 | i> flush() -> None |
|
1492 | i> flush() -> None | |
1652 | o> readline() -> 2: |
|
1493 | o> readline() -> 2: | |
1653 | o> 0\n |
|
1494 | o> 0\n | |
|
1495 | o> read(0) -> 0: | |||
|
1496 | o> readline() -> 2: | |||
|
1497 | o> 1\n | |||
|
1498 | o> read(1) -> 1: 1 | |||
|
1499 | result: 1 | |||
|
1500 | remote output: | |||
1654 | e> read(-1) -> 152: |
|
1501 | e> read(-1) -> 152: | |
1655 | e> adding changesets\n |
|
1502 | e> adding changesets\n | |
1656 | e> adding manifests\n |
|
1503 | e> adding manifests\n | |
@@ -1660,17 +1507,3 b' Pushing a bundle1 with ui.write() and ui' | |||||
1660 | e> ui.write_err 1\n |
|
1507 | e> ui.write_err 1\n | |
1661 | e> ui.write 2\n |
|
1508 | e> ui.write 2\n | |
1662 | e> ui.write_err 2\n |
|
1509 | e> ui.write_err 2\n | |
1663 | remote: adding changesets |
|
|||
1664 | remote: adding manifests |
|
|||
1665 | remote: adding file changes |
|
|||
1666 | remote: added 1 changesets with 1 changes to 1 files |
|
|||
1667 | remote: ui.write 1 |
|
|||
1668 | remote: ui.write_err 1 |
|
|||
1669 | remote: ui.write 2 |
|
|||
1670 | remote: ui.write_err 2 |
|
|||
1671 | o> read(0) -> 0: |
|
|||
1672 | o> readline() -> 2: |
|
|||
1673 | o> 1\n |
|
|||
1674 | o> read(1) -> 1: 1 |
|
|||
1675 | result: 1 |
|
|||
1676 | remote output: |
|
General Comments 0
You need to be logged in to leave comments.
Login now