Mercurial > public > mercurial-scm > hg-stable

diff mercurial/ui.py @ 28218:41dcd7545266

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 24 Feb 2016 15:55:44 -0600
parents 3b4537ba80e9 89003c49315c
children d09be0b8a3c6
line wrap: on
line diff
--- a/mercurial/ui.py	Wed Feb 24 10:41:15 2016 -0800
+++ b/mercurial/ui.py	Wed Feb 24 15:55:44 2016 -0600
@@ -796,7 +796,7 @@
         If ui is not interactive, the default is returned.
         """
         if not self.interactive():
-            self.write(msg, ' ', default, "\n")
+            self.write(msg, ' ', default or '', "\n")
             return default
         try:
             r = self._readline(self.label(msg, 'ui.prompt'))