# HG changeset patch
# User Simon Heimberg <[email protected]>
# Date 1238149235 -3600
# Node ID 7f9a6241a93608874e1283bc9003c8726bbb618c
# Parent 3b5c65f4df8a15e169d6d9eb30d97e686329fada
hglib: raise error in askpass and prompt when user cancels
diff -r 3b5c65f4df8a -r 7f9a6241a936 hggtk/hglib.py
--- a/hggtk/hglib.py Don Mär 26 23:03:12 2009 -0500
+++ b/hggtk/hglib.py Fre Mär 27 11:20:35 2009 +0100
@@ -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()
------------------------------------------------------------------------------
_______________________________________________
Tortoisehg-develop mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
