Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.8, 0.8.1, and 0.8.2

hglib: raise error in askpass and prompt when user cancels

Changeset 559084cf0397…

Parent 7ea2ba6a3319…

by Simon Heimberg

Changes to one file · Browse files at 559084cf0397 Showing diff from parent 7ea2ba6a3319 Diff from another changeset...

Change 1 of 2 Show Entire File hggtk/​hglib.py Stacked
 
145
146
147
 
 
148
149
150
 
157
158
159
160
 
 
 
 
161
162
163
 
145
146
147
148
149
150
151
152
 
159
160
161
 
162
163
164
165
166
167
168
@@ -145,6 +145,8 @@
  # send request to main thread, await response   self.dialogq.put( (msg, True, 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): @@ -157,7 +159,10 @@
  def getpass(self, prompt=None, default=None):   # send request to main thread, await response   self.dialogq.put( (prompt or _('password: '), False, default) ) - return self.responseq.get(True) + r = self.responseq.get(True) + if r is None: + raise util.Abort(_('response expected')) + return r     def print_exc(self):   traceback.print_exc()