equal
deleted
inserted
replaced
542 self.write(prompt) |
542 self.write(prompt) |
543 |
543 |
544 # instead of trying to emulate raw_input, swap self.fin with sys.stdin |
544 # instead of trying to emulate raw_input, swap self.fin with sys.stdin |
545 old = sys.stdin |
545 old = sys.stdin |
546 sys.stdin = self.fin |
546 sys.stdin = self.fin |
547 line = raw_input() |
547 line = raw_input(' ') |
548 sys.stdin = old |
548 sys.stdin = old |
549 |
549 |
550 # When stdin is in binary mode on Windows, it can cause |
550 # When stdin is in binary mode on Windows, it can cause |
551 # raw_input() to emit an extra trailing carriage return |
551 # raw_input() to emit an extra trailing carriage return |
552 if os.linesep == '\r\n' and line and line[-1] == '\r': |
552 if os.linesep == '\r\n' and line and line[-1] == '\r': |
559 """ |
559 """ |
560 if not self.interactive(): |
560 if not self.interactive(): |
561 self.write(msg, ' ', default, "\n") |
561 self.write(msg, ' ', default, "\n") |
562 return default |
562 return default |
563 try: |
563 try: |
564 r = self._readline(self.label(msg, 'ui.prompt') + ' ') |
564 r = self._readline(self.label(msg, 'ui.prompt')) |
565 if not r: |
565 if not r: |
566 return default |
566 return default |
567 return r |
567 return r |
568 except EOFError: |
568 except EOFError: |
569 raise util.Abort(_('response expected')) |
569 raise util.Abort(_('response expected')) |