From 0a782ae200e811d359a32073dcf8a623a225db74 Mon Sep 17 00:00:00 2001 From: Thomas Arendsen Hein Date: Thu, 27 Dec 2007 10:32:33 +0100 Subject: [PATCH] Make ui.prompt repeat on "unrecognized response" again (issue897) (this was accidentally changed in 18945c2eb022) --- mercurial/ui.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/mercurial/ui.py b/mercurial/ui.py index c1124109c3..e244539716 100644 --- a/mercurial/ui.py +++ b/mercurial/ui.py @@ -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