comparison mercurial/ui.py @ 19886:e828975722c8

merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 09 Oct 2013 14:15:34 -0700
parents ab3cf67740d6 ba2be32d14f2
children e5803150ea1d
comparison
equal deleted inserted replaced
19885:6cc696179869 19886:e828975722c8
663 663
664 def getpass(self, prompt=None, default=None): 664 def getpass(self, prompt=None, default=None):
665 if not self.interactive(): 665 if not self.interactive():
666 return default 666 return default
667 try: 667 try:
668 self.write(self.label(prompt or _('password: '), 'ui.prompt')) 668 self.write_err(self.label(prompt or _('password: '), 'ui.prompt'))
669 return getpass.getpass('') 669 return getpass.getpass('')
670 except EOFError: 670 except EOFError:
671 raise util.Abort(_('response expected')) 671 raise util.Abort(_('response expected'))
672 def status(self, *msg, **opts): 672 def status(self, *msg, **opts):
673 '''write status message to output (if ui.quiet is False) 673 '''write status message to output (if ui.quiet is False)