Mercurial > public > mercurial-scm > hg

diff mercurial/ui.py @ 22783:524b786bd54f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ui: disable echo back of prompt input if ui is set to non-tty purposely 9ab18a912c44 is nice for test output, but it also affects command-server channel. Command-server client shouldn't receive echo-back message, which makes it harder to parse the output.
author Yuya Nishihara <yuya@tcha.org>
date Wed, 08 Oct 2014 20:51:01 +0900
parents 4e64d255f1a8
children 5a831e4e6d7a
line wrap: on
line diff
--- a/mercurial/ui.py	Fri Oct 03 18:48:09 2014 -0700
+++ b/mercurial/ui.py	Wed Oct 08 20:51:01 2014 +0900
@@ -684,7 +684,9 @@
                 r = default
             # sometimes self.interactive disagrees with isatty,
             # show response provided on stdin when simulating
-            if not util.isatty(self.fin):
+            # but commandserver
+            if (not util.isatty(self.fin)
+                and not self.configbool('ui', 'nontty')):
                 self.write(r, "\n")
             return r
         except EOFError: