##// END OF EJS Templates
py3: fix EOL detection in commandserver.channeledinput...
Yuya Nishihara -
r44857:98c14f01 stable
parent child Browse files
Show More
@@ -160,7 +160,7 b' class channeledinput(object):'
160 buf = s
160 buf = s
161 # keep asking for more until there's either no more or
161 # keep asking for more until there's either no more or
162 # we got a full line
162 # we got a full line
163 while s and s[-1] != b'\n':
163 while s and not s.endswith(b'\n'):
164 s = self._read(size, b'L')
164 s = self._read(size, b'L')
165 buf += s
165 buf += s
166
166
@@ -654,6 +654,9 b' changelog and manifest would have invali'
654 ... runcommand(server, [b'debugprompt', b'--config',
654 ... runcommand(server, [b'debugprompt', b'--config',
655 ... b'ui.interactive=True'],
655 ... b'ui.interactive=True'],
656 ... input=stringio(b'5678\n'))
656 ... input=stringio(b'5678\n'))
657 ... runcommand(server, [b'debugprompt', b'--config',
658 ... b'ui.interactive=True'],
659 ... input=stringio(b'\nremainder\nshould\nnot\nbe\nread\n'))
657 ... runcommand(server, [b'debugreadstdin'])
660 ... runcommand(server, [b'debugreadstdin'])
658 ... runcommand(server, [b'debugwritestdout'])
661 ... runcommand(server, [b'debugwritestdout'])
659 *** runcommand debuggetpass --config ui.interactive=True
662 *** runcommand debuggetpass --config ui.interactive=True
@@ -665,6 +668,8 b' changelog and manifest would have invali'
665 [255]
668 [255]
666 *** runcommand debugprompt --config ui.interactive=True
669 *** runcommand debugprompt --config ui.interactive=True
667 prompt: 5678
670 prompt: 5678
671 *** runcommand debugprompt --config ui.interactive=True
672 prompt: y
668 *** runcommand debugreadstdin
673 *** runcommand debugreadstdin
669 read: ''
674 read: ''
670 *** runcommand debugwritestdout
675 *** runcommand debugwritestdout
General Comments 0
You need to be logged in to leave comments. Login now