Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/ui.py @ 7798:57fee79e5588
catch CTRL-D at password prompt
We caught this exception in ui.prompt(), but not here. Without
this, hitting CTRL-D at the password prompt gives a long traceback.
author | Steve Borho <steve@borho.org> |
---|---|
date | Sat, 21 Feb 2009 17:46:06 -0600 |
parents | f7739cf3833c |
children | cece135ffcf0 |
comparison
equal
deleted
inserted
replaced
7797:e48cc2315fe6 | 7798:57fee79e5588 |
---|---|
437 except EOFError: | 437 except EOFError: |
438 raise util.Abort(_('response expected')) | 438 raise util.Abort(_('response expected')) |
439 | 439 |
440 def getpass(self, prompt=None, default=None): | 440 def getpass(self, prompt=None, default=None): |
441 if not self.interactive: return default | 441 if not self.interactive: return default |
442 return getpass.getpass(prompt or _('password: ')) | 442 try: |
443 return getpass.getpass(prompt or _('password: ')) | |
444 except EOFError: | |
445 raise util.Abort(_('response expected')) | |
443 def status(self, *msg): | 446 def status(self, *msg): |
444 if not self.quiet: self.write(*msg) | 447 if not self.quiet: self.write(*msg) |
445 def warn(self, *msg): | 448 def warn(self, *msg): |
446 self.write_err(*msg) | 449 self.write_err(*msg) |
447 def note(self, *msg): | 450 def note(self, *msg): |