Show More
@@ -711,11 +711,7 b' class ui(object):' | |||
|
711 | 711 | r = self._readline(self.label(msg, 'ui.prompt')) |
|
712 | 712 | if not r: |
|
713 | 713 | r = default |
|
714 | # sometimes self.interactive disagrees with isatty, | |
|
715 | # show response provided on stdin when simulating | |
|
716 | # but commandserver | |
|
717 | if (not util.isatty(self.fin) | |
|
718 | and not self.configbool('ui', 'nontty')): | |
|
714 | if self.configbool('ui', 'promptecho'): | |
|
719 | 715 | self.write(r, "\n") |
|
720 | 716 | return r |
|
721 | 717 | except EOFError: |
@@ -681,6 +681,7 b' class Test(unittest.TestCase):' | |||
|
681 | 681 | hgrc.write('slash = True\n') |
|
682 | 682 | hgrc.write('interactive = False\n') |
|
683 | 683 | hgrc.write('mergemarkers = detailed\n') |
|
684 | hgrc.write('promptecho = True\n') | |
|
684 | 685 | hgrc.write('[defaults]\n') |
|
685 | 686 | hgrc.write('backout = -d "0 0"\n') |
|
686 | 687 | hgrc.write('commit = -d "0 0"\n') |
General Comments 0
You need to be logged in to leave comments.
Login now