Show More
@@ -365,6 +365,7 b' class sshv1peer(wireproto.wirepeer):' | |||
|
365 | 365 | self._pipei = stdout |
|
366 | 366 | self._pipee = stderr |
|
367 | 367 | self._caps = caps |
|
368 | self._autoreadstderr = autoreadstderr | |
|
368 | 369 | |
|
369 | 370 | # Commands that have a "framed" response where the first line of the |
|
370 | 371 | # response contains the length of that response. |
@@ -510,9 +511,11 b' class sshv1peer(wireproto.wirepeer):' | |||
|
510 | 511 | def _getamount(self): |
|
511 | 512 | l = self._pipei.readline() |
|
512 | 513 | if l == '\n': |
|
514 | if self._autoreadstderr: | |
|
513 | 515 | self._readerr() |
|
514 | 516 | msg = _('check previous remote output') |
|
515 | 517 | self._abort(error.OutOfBandError(hint=msg)) |
|
518 | if self._autoreadstderr: | |
|
516 | 519 | self._readerr() |
|
517 | 520 | try: |
|
518 | 521 | return int(l) |
@@ -528,6 +531,7 b' class sshv1peer(wireproto.wirepeer):' | |||
|
528 | 531 | self._pipeo.write(data) |
|
529 | 532 | if flush: |
|
530 | 533 | self._pipeo.flush() |
|
534 | if self._autoreadstderr: | |
|
531 | 535 | self._readerr() |
|
532 | 536 | |
|
533 | 537 | class sshv2peer(sshv1peer): |
@@ -45,6 +45,7 b' Test pushing bundle1 payload to a server' | |||
|
45 | 45 | > # This is "force" in hex. |
|
46 | 46 | > heads 666f726365 |
|
47 | 47 | > PUSHFILE ../initial.v1.hg |
|
48 | > readavailable | |
|
48 | 49 | > EOF |
|
49 | 50 | testing ssh1 |
|
50 | 51 | creating ssh peer from handshake results |
@@ -87,17 +88,15 b' Test pushing bundle1 payload to a server' | |||
|
87 | 88 | i> flush() -> None |
|
88 | 89 | o> readline() -> 2: |
|
89 | 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 | 91 | o> read(0) -> 0: |
|
96 | 92 | o> readline() -> 2: |
|
97 | 93 | o> 1\n |
|
98 | 94 | o> read(1) -> 1: 0 |
|
99 | 95 | result: 0 |
|
100 | 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 | 101 | testing ssh2 |
|
103 | 102 | creating ssh peer from handshake results |
@@ -140,17 +139,15 b' Test pushing bundle1 payload to a server' | |||
|
140 | 139 | i> flush() -> None |
|
141 | 140 | o> readline() -> 2: |
|
142 | 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 | 142 | o> read(0) -> 0: |
|
149 | 143 | o> readline() -> 2: |
|
150 | 144 | o> 1\n |
|
151 | 145 | o> read(1) -> 1: 0 |
|
152 | 146 | result: 0 |
|
153 | 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 | 152 | $ cd .. |
|
156 | 153 | |
@@ -217,6 +214,7 b' ui.write() in hook is redirected to stde' | |||
|
217 | 214 | > # This is "force" in hex. |
|
218 | 215 | > heads 666f726365 |
|
219 | 216 | > PUSHFILE ../initial.v1.hg |
|
217 | > readavailable | |
|
220 | 218 | > EOF |
|
221 | 219 | testing ssh1 |
|
222 | 220 | creating ssh peer from handshake results |
@@ -259,6 +257,12 b' ui.write() in hook is redirected to stde' | |||
|
259 | 257 | i> flush() -> None |
|
260 | 258 | o> readline() -> 2: |
|
261 | 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 | 266 | e> read(-1) -> 196: |
|
263 | 267 | e> adding changesets\n |
|
264 | 268 | e> adding manifests\n |
@@ -268,20 +272,6 b' ui.write() in hook is redirected to stde' | |||
|
268 | 272 | e> transaction abort!\n |
|
269 | 273 | e> rollback completed\n |
|
270 | 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 | 276 | testing ssh2 |
|
287 | 277 | creating ssh peer from handshake results |
@@ -324,6 +314,12 b' ui.write() in hook is redirected to stde' | |||
|
324 | 314 | i> flush() -> None |
|
325 | 315 | o> readline() -> 2: |
|
326 | 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 | 323 | e> read(-1) -> 196: |
|
328 | 324 | e> adding changesets\n |
|
329 | 325 | e> adding manifests\n |
@@ -333,20 +329,6 b' ui.write() in hook is redirected to stde' | |||
|
333 | 329 | e> transaction abort!\n |
|
334 | 330 | e> rollback completed\n |
|
335 | 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 | 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 | 342 | > # This is "force" in hex. |
|
361 | 343 | > heads 666f726365 |
|
362 | 344 | > PUSHFILE ../initial.v1.hg |
|
345 | > readavailable | |
|
363 | 346 | > EOF |
|
364 | 347 | testing ssh1 |
|
365 | 348 | creating ssh peer from handshake results |
@@ -402,6 +385,12 b' And a variation that writes multiple lin' | |||
|
402 | 385 | i> flush() -> None |
|
403 | 386 | o> readline() -> 2: |
|
404 | 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 | 394 | e> read(-1) -> 218: |
|
406 | 395 | e> adding changesets\n |
|
407 | 396 | e> adding manifests\n |
@@ -412,21 +401,6 b' And a variation that writes multiple lin' | |||
|
412 | 401 | e> transaction abort!\n |
|
413 | 402 | e> rollback completed\n |
|
414 | 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 | 405 | testing ssh2 |
|
432 | 406 | creating ssh peer from handshake results |
@@ -469,6 +443,12 b' And a variation that writes multiple lin' | |||
|
469 | 443 | i> flush() -> None |
|
470 | 444 | o> readline() -> 2: |
|
471 | 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 | 452 | e> read(-1) -> 218: |
|
473 | 453 | e> adding changesets\n |
|
474 | 454 | e> adding manifests\n |
@@ -479,21 +459,6 b' And a variation that writes multiple lin' | |||
|
479 | 459 | e> transaction abort!\n |
|
480 | 460 | e> rollback completed\n |
|
481 | 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 | 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 | 472 | > # This is "force" in hex. |
|
508 | 473 | > heads 666f726365 |
|
509 | 474 | > PUSHFILE ../initial.v1.hg |
|
475 | > readavailable | |
|
510 | 476 | > EOF |
|
511 | 477 | testing ssh1 |
|
512 | 478 | creating ssh peer from handshake results |
@@ -549,6 +515,12 b' And a variation that does a ui.flush() a' | |||
|
549 | 515 | i> flush() -> None |
|
550 | 516 | o> readline() -> 2: |
|
551 | 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 | 524 | e> read(-1) -> 202: |
|
553 | 525 | e> adding changesets\n |
|
554 | 526 | e> adding manifests\n |
@@ -558,20 +530,6 b' And a variation that does a ui.flush() a' | |||
|
558 | 530 | e> transaction abort!\n |
|
559 | 531 | e> rollback completed\n |
|
560 | 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 | 534 | testing ssh2 |
|
577 | 535 | creating ssh peer from handshake results |
@@ -614,6 +572,12 b' And a variation that does a ui.flush() a' | |||
|
614 | 572 | i> flush() -> None |
|
615 | 573 | o> readline() -> 2: |
|
616 | 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 | 581 | e> read(-1) -> 202: |
|
618 | 582 | e> adding changesets\n |
|
619 | 583 | e> adding manifests\n |
@@ -623,20 +587,6 b' And a variation that does a ui.flush() a' | |||
|
623 | 587 | e> transaction abort!\n |
|
624 | 588 | e> rollback completed\n |
|
625 | 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 | 591 | Multiple writes + flush |
|
642 | 592 | |
@@ -650,6 +600,7 b' Multiple writes + flush' | |||
|
650 | 600 | > # This is "force" in hex. |
|
651 | 601 | > heads 666f726365 |
|
652 | 602 | > PUSHFILE ../initial.v1.hg |
|
603 | > readavailable | |
|
653 | 604 | > EOF |
|
654 | 605 | testing ssh1 |
|
655 | 606 | creating ssh peer from handshake results |
@@ -692,6 +643,12 b' Multiple writes + flush' | |||
|
692 | 643 | i> flush() -> None |
|
693 | 644 | o> readline() -> 2: |
|
694 | 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 | 652 | e> read(-1) -> 206: |
|
696 | 653 | e> adding changesets\n |
|
697 | 654 | e> adding manifests\n |
@@ -702,21 +659,6 b' Multiple writes + flush' | |||
|
702 | 659 | e> transaction abort!\n |
|
703 | 660 | e> rollback completed\n |
|
704 | 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 | 663 | testing ssh2 |
|
722 | 664 | creating ssh peer from handshake results |
@@ -759,6 +701,12 b' Multiple writes + flush' | |||
|
759 | 701 | i> flush() -> None |
|
760 | 702 | o> readline() -> 2: |
|
761 | 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 | 710 | e> read(-1) -> 206: |
|
763 | 711 | e> adding changesets\n |
|
764 | 712 | e> adding manifests\n |
@@ -769,21 +717,6 b' Multiple writes + flush' | |||
|
769 | 717 | e> transaction abort!\n |
|
770 | 718 | e> rollback completed\n |
|
771 | 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 | 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 | 730 | > # This is "force" in hex. |
|
798 | 731 | > heads 666f726365 |
|
799 | 732 | > PUSHFILE ../initial.v1.hg |
|
733 | > readavailable | |
|
800 | 734 | > EOF |
|
801 | 735 | testing ssh1 |
|
802 | 736 | creating ssh peer from handshake results |
@@ -839,6 +773,12 b' ui.write() + ui.write_err() output is ca' | |||
|
839 | 773 | i> flush() -> None |
|
840 | 774 | o> readline() -> 2: |
|
841 | 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 | 782 | e> read(-1) -> 232: |
|
843 | 783 | e> adding changesets\n |
|
844 | 784 | e> adding manifests\n |
@@ -851,23 +791,6 b' ui.write() + ui.write_err() output is ca' | |||
|
851 | 791 | e> transaction abort!\n |
|
852 | 792 | e> rollback completed\n |
|
853 | 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 | 795 | testing ssh2 |
|
873 | 796 | creating ssh peer from handshake results |
@@ -910,6 +833,12 b' ui.write() + ui.write_err() output is ca' | |||
|
910 | 833 | i> flush() -> None |
|
911 | 834 | o> readline() -> 2: |
|
912 | 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 | 842 | e> read(-1) -> 232: |
|
914 | 843 | e> adding changesets\n |
|
915 | 844 | e> adding manifests\n |
@@ -922,23 +851,6 b' ui.write() + ui.write_err() output is ca' | |||
|
922 | 851 | e> transaction abort!\n |
|
923 | 852 | e> rollback completed\n |
|
924 | 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 | 855 | print() output is captured |
|
944 | 856 | |
@@ -952,6 +864,7 b' print() output is captured' | |||
|
952 | 864 | > # This is "force" in hex. |
|
953 | 865 | > heads 666f726365 |
|
954 | 866 | > PUSHFILE ../initial.v1.hg |
|
867 | > readavailable | |
|
955 | 868 | > EOF |
|
956 | 869 | testing ssh1 |
|
957 | 870 | creating ssh peer from handshake results |
@@ -994,6 +907,12 b' print() output is captured' | |||
|
994 | 907 | i> flush() -> None |
|
995 | 908 | o> readline() -> 2: |
|
996 | 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 | 916 | e> read(-1) -> 193: |
|
998 | 917 | e> adding changesets\n |
|
999 | 918 | e> adding manifests\n |
@@ -1003,20 +922,6 b' print() output is captured' | |||
|
1003 | 922 | e> transaction abort!\n |
|
1004 | 923 | e> rollback completed\n |
|
1005 | 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 | 926 | testing ssh2 |
|
1022 | 927 | creating ssh peer from handshake results |
@@ -1059,6 +964,12 b' print() output is captured' | |||
|
1059 | 964 | i> flush() -> None |
|
1060 | 965 | o> readline() -> 2: |
|
1061 | 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 | 973 | e> read(-1) -> 193: |
|
1063 | 974 | e> adding changesets\n |
|
1064 | 975 | e> adding manifests\n |
@@ -1068,20 +979,6 b' print() output is captured' | |||
|
1068 | 979 | e> transaction abort!\n |
|
1069 | 980 | e> rollback completed\n |
|
1070 | 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 | 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 | 992 | > # This is "force" in hex. |
|
1096 | 993 | > heads 666f726365 |
|
1097 | 994 | > PUSHFILE ../initial.v1.hg |
|
995 | > readavailable | |
|
1098 | 996 | > EOF |
|
1099 | 997 | testing ssh1 |
|
1100 | 998 | creating ssh peer from handshake results |
@@ -1137,6 +1035,12 b' Mixed print() and ui.write() are both ca' | |||
|
1137 | 1035 | i> flush() -> None |
|
1138 | 1036 | o> readline() -> 2: |
|
1139 | 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 | 1044 | e> read(-1) -> 218: |
|
1141 | 1045 | e> adding changesets\n |
|
1142 | 1046 | e> adding manifests\n |
@@ -1149,23 +1053,6 b' Mixed print() and ui.write() are both ca' | |||
|
1149 | 1053 | e> transaction abort!\n |
|
1150 | 1054 | e> rollback completed\n |
|
1151 | 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 | 1057 | testing ssh2 |
|
1171 | 1058 | creating ssh peer from handshake results |
@@ -1208,6 +1095,12 b' Mixed print() and ui.write() are both ca' | |||
|
1208 | 1095 | i> flush() -> None |
|
1209 | 1096 | o> readline() -> 2: |
|
1210 | 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 | 1104 | e> read(-1) -> 218: |
|
1212 | 1105 | e> adding changesets\n |
|
1213 | 1106 | e> adding manifests\n |
@@ -1220,23 +1113,6 b' Mixed print() and ui.write() are both ca' | |||
|
1220 | 1113 | e> transaction abort!\n |
|
1221 | 1114 | e> rollback completed\n |
|
1222 | 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 | 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 | 1126 | > # This is "force" in hex. |
|
1251 | 1127 | > heads 666f726365 |
|
1252 | 1128 | > PUSHFILE ../initial.v1.hg |
|
1129 | > readavailable | |
|
1253 | 1130 | > EOF |
|
1254 | 1131 | testing ssh1 |
|
1255 | 1132 | creating ssh peer from handshake results |
@@ -1292,6 +1169,12 b' print() to stdout and stderr both get ca' | |||
|
1292 | 1169 | i> flush() -> None |
|
1293 | 1170 | o> readline() -> 2: |
|
1294 | 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 | 1178 | e> read(-1) -> 216: |
|
1296 | 1179 | e> adding changesets\n |
|
1297 | 1180 | e> adding manifests\n |
@@ -1304,23 +1187,6 b' print() to stdout and stderr both get ca' | |||
|
1304 | 1187 | e> transaction abort!\n |
|
1305 | 1188 | e> rollback completed\n |
|
1306 | 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 | 1191 | testing ssh2 |
|
1326 | 1192 | creating ssh peer from handshake results |
@@ -1363,6 +1229,12 b' print() to stdout and stderr both get ca' | |||
|
1363 | 1229 | i> flush() -> None |
|
1364 | 1230 | o> readline() -> 2: |
|
1365 | 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 | 1238 | e> read(-1) -> 216: |
|
1367 | 1239 | e> adding changesets\n |
|
1368 | 1240 | e> adding manifests\n |
@@ -1375,23 +1247,6 b' print() to stdout and stderr both get ca' | |||
|
1375 | 1247 | e> transaction abort!\n |
|
1376 | 1248 | e> rollback completed\n |
|
1377 | 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 |
$ |
|
1397 | 1252 | |
@@ -1405,6 +1260,7 b' Pushing a bundle1 with no output' | |||
|
1405 | 1260 | > # This is "force" in hex. |
|
1406 | 1261 | > heads 666f726365 |
|
1407 | 1262 | > PUSHFILE ../initial.v1.hg |
|
1263 | > readavailable | |
|
1408 | 1264 | > EOF |
|
1409 | 1265 | testing ssh1 |
|
1410 | 1266 | creating ssh peer from handshake results |
@@ -1447,21 +1303,17 b' Pushing a bundle1 with no output' | |||
|
1447 | 1303 | i> flush() -> None |
|
1448 | 1304 | o> readline() -> 2: |
|
1449 | 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 | 1306 | o> read(0) -> 0: |
|
1460 | 1307 | o> readline() -> 2: |
|
1461 | 1308 | o> 1\n |
|
1462 | 1309 | o> read(1) -> 1: 1 |
|
1463 | 1310 | result: 1 |
|
1464 | 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 | 1318 | testing ssh2 |
|
1467 | 1319 | creating ssh peer from handshake results |
@@ -1504,21 +1356,17 b' Pushing a bundle1 with no output' | |||
|
1504 | 1356 | i> flush() -> None |
|
1505 | 1357 | o> readline() -> 2: |
|
1506 | 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 | 1359 | o> read(0) -> 0: |
|
1517 | 1360 | o> readline() -> 2: |
|
1518 | 1361 | o> 1\n |
|
1519 | 1362 | o> read(1) -> 1: 1 |
|
1520 | 1363 | result: 1 |
|
1521 | 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 |
$ |
|
1524 | 1372 | |
@@ -1544,6 +1392,7 b' Pushing a bundle1 with ui.write() and ui' | |||
|
1544 | 1392 | > # This is "force" in hex. |
|
1545 | 1393 | > heads 666f726365 |
|
1546 | 1394 | > PUSHFILE ../initial.v1.hg |
|
1395 | > readavailable | |
|
1547 | 1396 | > EOF |
|
1548 | 1397 | testing ssh1 |
|
1549 | 1398 | creating ssh peer from handshake results |
@@ -1586,6 +1435,12 b' Pushing a bundle1 with ui.write() and ui' | |||
|
1586 | 1435 | i> flush() -> None |
|
1587 | 1436 | o> readline() -> 2: |
|
1588 | 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 | 1444 | e> read(-1) -> 152: |
|
1590 | 1445 | e> adding changesets\n |
|
1591 | 1446 | e> adding manifests\n |
@@ -1595,20 +1450,6 b' Pushing a bundle1 with ui.write() and ui' | |||
|
1595 | 1450 | e> ui.write_err 1\n |
|
1596 | 1451 | e> ui.write 2\n |
|
1597 | 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 | 1454 | testing ssh2 |
|
1614 | 1455 | creating ssh peer from handshake results |
@@ -1651,6 +1492,12 b' Pushing a bundle1 with ui.write() and ui' | |||
|
1651 | 1492 | i> flush() -> None |
|
1652 | 1493 | o> readline() -> 2: |
|
1653 | 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 | 1501 | e> read(-1) -> 152: |
|
1655 | 1502 | e> adding changesets\n |
|
1656 | 1503 | e> adding manifests\n |
@@ -1660,17 +1507,3 b' Pushing a bundle1 with ui.write() and ui' | |||
|
1660 | 1507 | e> ui.write_err 1\n |
|
1661 | 1508 | e> ui.write 2\n |
|
1662 | 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