Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.9, 0.9.1, and 0.9.1.1

hgthread: delete compatibility code for Mercurail < 1.3

Changeset 1e3719600bfc…

Parent ea2f8ef16862…

by Simon Heimberg

Changes to one file · Browse files at 1e3719600bfc Showing diff from parent ea2f8ef16862 Diff from another changeset...

Change 1 of 1 Show Entire File hggtk/​hgthread.py Stacked
 
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
 
 
 
 
 
 
 
 
 
 
 
75
76
77
 
52
53
54
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
55
56
57
58
59
60
61
62
63
64
65
66
67
68
@@ -52,26 +52,17 @@
  def prompt(self, msg, choices=None, default="y"):   import re   if not self.interactive(): return default - if isinstance(choices, str): - pat = choices - choices = None - else: - pat = None - while True: - try: - # send request to main thread, await response - self.dialogq.put( (msg, True, choices, default) ) - r = self.responseq.get(True) - if r is None: - raise EOFError - if not r: - return default - if not pat or re.match(pat, r): - return r - else: - self.write(_('unrecognized response\n')) - except EOFError: - raise util.Abort(_('response expected')) + try: + # send request to main thread, await response + self.dialogq.put( (msg, True, choices, default) ) + r = self.responseq.get(True) + if r is None: + raise EOFError + if not r: + return default + return r + except EOFError: + raise util.Abort(_('response expected'))     def getpass(self, prompt=None, default=None):   # send request to main thread, await response