diff mercurial/ui.py @ 15054:7c03e3b1b858

merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 25 Aug 2011 16:21:53 -0500
parents cc669e4fec95 17ffb30d9174
children cc16323e748d
line wrap: on
line diff
--- a/mercurial/ui.py	Mon Aug 22 00:42:38 2011 +0200
+++ b/mercurial/ui.py	Thu Aug 25 16:21:53 2011 -0500
@@ -558,7 +558,7 @@
         # instead of trying to emulate raw_input, swap self.fin with sys.stdin
         old = sys.stdin
         sys.stdin = self.fin
-        line = raw_input()
+        line = raw_input(' ')
         sys.stdin = old
 
         # When stdin is in binary mode on Windows, it can cause
@@ -575,7 +575,7 @@
             self.write(msg, ' ', default, "\n")
             return default
         try:
-            r = self._readline(self.label(msg, 'ui.prompt') + ' ')
+            r = self._readline(self.label(msg, 'ui.prompt'))
             if not r:
                 return default
             return r