mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 23:38:50 +03:00
Make ui.prompt repeat on "unrecognized response" again (issue897)
(this was accidentally changed in 18945c2eb022)
This commit is contained in:
parent
94bdbd585c
commit
0a782ae200
@ -407,14 +407,15 @@ class ui(object):
|
||||
|
||||
def prompt(self, msg, pat=None, default="y", matchflags=0):
|
||||
if not self.interactive: return default
|
||||
try:
|
||||
r = self._readline(msg + ' ')
|
||||
if not pat or re.match(pat, r, matchflags):
|
||||
return r
|
||||
else:
|
||||
self.write(_("unrecognized response\n"))
|
||||
except EOFError:
|
||||
raise util.Abort(_('response expected'))
|
||||
while True:
|
||||
try:
|
||||
r = self._readline(msg + ' ')
|
||||
if not pat or re.match(pat, r, matchflags):
|
||||
return r
|
||||
else:
|
||||
self.write(_("unrecognized response\n"))
|
||||
except EOFError:
|
||||
raise util.Abort(_('response expected'))
|
||||
|
||||
def getpass(self, prompt=None, default=None):
|
||||
if not self.interactive: return default
|
||||
|
Loading…
Reference in New Issue
Block a user