Mercurial > public > mercurial-scm > hg
comparison mercurial/ui.py @ 5696:6ba5ecc27d33
merge with crew-stable
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Thu, 27 Dec 2007 13:39:59 +0100 |
parents | 3c80ecdc1bcd b5605d88dc27 |
children | 9dc26941020b |
comparison
equal
deleted
inserted
replaced
5695:1ce185f3c640 | 5696:6ba5ecc27d33 |
---|---|
410 line = line[:-1] | 410 line = line[:-1] |
411 return line | 411 return line |
412 | 412 |
413 def prompt(self, msg, pat=None, default="y", matchflags=0): | 413 def prompt(self, msg, pat=None, default="y", matchflags=0): |
414 if not self.interactive: return default | 414 if not self.interactive: return default |
415 try: | 415 while True: |
416 r = self._readline(msg + ' ') | 416 try: |
417 if not pat or re.match(pat, r, matchflags): | 417 r = self._readline(msg + ' ') |
418 return r | 418 if not pat or re.match(pat, r, matchflags): |
419 else: | 419 return r |
420 self.write(_("unrecognized response\n")) | 420 else: |
421 except EOFError: | 421 self.write(_("unrecognized response\n")) |
422 raise util.Abort(_('response expected')) | 422 except EOFError: |
423 raise util.Abort(_('response expected')) | |
423 | 424 |
424 def getpass(self, prompt=None, default=None): | 425 def getpass(self, prompt=None, default=None): |
425 if not self.interactive: return default | 426 if not self.interactive: return default |
426 return getpass.getpass(prompt or _('password: ')) | 427 return getpass.getpass(prompt or _('password: ')) |
427 def status(self, *msg): | 428 def status(self, *msg): |