Mercurial > public > mercurial-scm > hg-stable

comparison 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
comparison
equal deleted inserted replaced
28217:d2ac8b57a75d 28218:41dcd7545266
794 def prompt(self, msg, default="y"): 794 def prompt(self, msg, default="y"):
795 """Prompt user with msg, read response. 795 """Prompt user with msg, read response.
796 If ui is not interactive, the default is returned. 796 If ui is not interactive, the default is returned.
797 """ 797 """
798 if not self.interactive(): 798 if not self.interactive():
799 self.write(msg, ' ', default, "\n") 799 self.write(msg, ' ', default or '', "\n")
800 return default 800 return default
801 try: 801 try:
802 r = self._readline(self.label(msg, 'ui.prompt')) 802 r = self._readline(self.label(msg, 'ui.prompt'))
803 if not r: 803 if not r:
804 r = default 804 r = default