# HG changeset patch
# User Simon Heimberg <sim...@besonet.ch>
# Date 1245934322 -7200
# Node ID 3feec6815fab0ae52ee73543c449621bc181184e
# Parent 1b9a75dce1e3ea0b4a44608c9e61e2b8ce2762f1
hgthread: delete compatibility code for Mercurail < 1.3
diff -r 1b9a75dce1e3 -r 3feec6815fab hggtk/hgthread.py
--- a/hggtk/hgthread.py Don Jun 25 14:50:22 2009 +0200
+++ b/hggtk/hgthread.py Don Jun 25 14:52:02 2009 +0200
@@ -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
------------------------------------------------------------------------------
_______________________________________________
Tortoisehg-develop mailing list
Tortoisehg-develop@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
