Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.1, 2.1.1, and 2.1.2

hglib: add dispatch function

see mercurial changes 08bfec2ef031, 80c599eee3f3

Changeset c4a0fc68dc0b…

Parent f3d41f688074…

by Adrian Buehlmann

Changes to 3 files · Browse files at c4a0fc68dc0b Showing diff from parent f3d41f688074 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​thread.py Stacked
 
15
16
17
18
 
19
20
21
 
271
272
273
274
 
275
276
277
 
15
16
17
 
18
19
20
21
 
271
272
273
 
274
275
276
277
@@ -15,7 +15,7 @@
 from PyQt4.QtCore import *  from PyQt4.QtGui import *   -from mercurial import util, error, dispatch +from mercurial import util, error  from mercurial import ui as uimod    from tortoisehg.util import thread2, hglib @@ -271,7 +271,7 @@
  for k, v in ui.configitems('defaults'):   ui.setconfig('defaults', k, '')   self.ret = 255 - self.ret = dispatch._dispatch(ui, self.cmdline) or 0 + self.ret = hglib.dispatch(ui, self.cmdline) or 0   except util.Abort, e:   ui.write_err(local._('abort: ') + str(e) + '\n')   if e.hint:
Change 1 of 1 Show Changes Only tortoisehg/​hgtk/​hgthread.py Stacked
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
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
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
 
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
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
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
 
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
 # hgthread.py - Gtk UI class TortoiseHg  #  # Copyright 2009 Steve Borho <steve@borho.org>  #  # This software may be used and distributed according to the terms of the  # GNU General Public License version 2, incorporated herein by reference.    import gtk  import Queue  import time  import urllib2    from mercurial import ui, util, error    from tortoisehg.util.i18n import _  from tortoisehg.util import hglib, thread2    from tortoisehg.hgtk import dialog, gdialog    class GtkUi(ui.ui):   '''   PyGtk enabled mercurial.ui subclass. All this code will be running   in a background thread, so it cannot directly call into Gtk.   Instead, it places output and dialog requests onto queues for the   main thread to pickup.   '''   def __init__(self, src=None, outputq=None, errorq=None, dialogq=None,   responseq=None, progressq=None):   super(GtkUi, self).__init__(src)   if src:   self.outputq = src.outputq   self.errorq = src.errorq   self.dialogq = src.dialogq   self.responseq = src.responseq   self.progressq = src.progressq   else:   self.outputq = outputq   self.errorq = errorq   self.dialogq = dialogq   self.responseq = responseq   self.progressq = progressq   self.setconfig('ui', 'interactive', 'on')   self.setconfig('progress', 'disable', 'True')     def write(self, *args, **opts):   if self._buffers:   self._buffers[-1].extend([str(a) for a in args])   else:   for a in args:   self.outputq.put((str(a), opts.get('label', '')))     def write_err(self, *args, **opts):   for a in args:   self.errorq.put(str(a))     def label(self, msg, label):   return msg     def flush(self):   pass     def prompt(self, msg, choices=None, default="y"):   if not self.interactive(): return default   try:   # send request to main thread, await response   self.dialogq.put( (msg, True, choices, None) )   r = self.responseq.get(True)   if r is None:   raise EOFError   if not r:   return default   if choices:   # return char for Mercurial 1.3   choice = choices[r]   return choice[choice.index("&")+1].lower()   return r   except EOFError:   raise util.Abort(_('response expected'))     def promptchoice(self, msg, choices, default=0):   if not self.interactive(): return default   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   return r   except EOFError:   raise util.Abort(_('response expected'))     def getpass(self, prompt=None, default=None):   # send request to main thread, await response   self.dialogq.put( (prompt or _('password: '), False, None, default) )   r = self.responseq.get(True)   if r is None:   raise util.Abort(_('response expected'))   return r     def progress(self, topic, pos, item='', unit='', total=None):   self.progressq.put( (topic, item, pos, total, unit) )      class HgThread(thread2.Thread):   '''   Run an hg command in a background thread, implies output is being   sent to a rendered text buffer interactively and requests for   feedback from Mercurial can be handled by the user via dialog   windows.   '''   def __init__(self, args=[], postfunc=None, parent=None):   self.outputq = Queue.Queue()   self.errorq = Queue.Queue()   self.dialogq = Queue.Queue()   self.responseq = Queue.Queue()   self.progressq = Queue.Queue()   self.ui = GtkUi(None, self.outputq, self.errorq, self.dialogq,   self.responseq, self.progressq)   self.args = args   self.ret = None   self.postfunc = postfunc   self.parent = parent   thread2.Thread.__init__(self)     def getqueue(self):   return self.outputq     def geterrqueue(self):   return self.errorq     def getprogqueue(self):   return self.progressq     def return_code(self):   '''   None - command is incomplete, possibly exited with exception   0 - command returned successfully   else an error was returned   '''   return self.ret     def process_dialogs(self):   '''Polled every 10ms to serve dialogs for the background thread'''   try:   (prompt, visible, choices, default) = self.dialogq.get_nowait()   if choices:   dlg = gdialog.CustomPrompt('Hg Prompt', prompt,   self.parent, choices, default)   dlg.connect('response', self.prompt_response)   dlg.show_all()   else:   dlg = dialog.entry_dialog(self.parent, prompt,   visible, default, self.dialog_response)   except Queue.Empty:   pass     def prompt_response(self, dialog, response_id):   dialog.destroy()   if response_id == gtk.RESPONSE_DELETE_EVENT:   self.responseq.put(None)   else:   self.responseq.put(response_id)     def dialog_response(self, dialog, response_id):   if response_id == gtk.RESPONSE_OK:   text = dialog.entry.get_text()   else:   text = None   dialog.destroy()   self.responseq.put(text)     def run(self):   try:   for k, v in self.ui.configitems('defaults'):   self.ui.setconfig('defaults', k, '')   l = 'control' - ret = hglib.dispatch._dispatch(self.ui, self.args) + ret = hglib.dispatch(self.ui, self.args)   if ret:   self.ui.write(_('[command returned code %d ') % int(ret), label=l)   else:   self.ui.write(_('[command completed successfully '), label=l)   self.ui.write(time.asctime() + ']\n', label=l)   self.ret = ret or 0   if self.postfunc:   self.postfunc(ret)   except util.Abort, e:   self.ui.write_err(_('abort: ') + str(e) + '\n')   except (error.RepoError, urllib2.HTTPError), e:   self.ui.write_err(str(e) + '\n')   except urllib2.URLError, e:   import ssl   err = str(e)   if isinstance(e.args[0], ssl.SSLError):   parts = e.args[0].strerror.split(':')   if len(parts) == 7:   file, line, level, errno, lib, func, reason = parts   if func == 'SSL3_GET_SERVER_CERTIFICATE':   err = _('SSL: Server certificate verify failed')   elif errno == '00000000':   err = _('SSL: unknown error %s:%s') % (file, line)   else:   err = _('SSL error: %s') % reason   self.ui.write_err(err + '\n')   except (Exception, OSError, IOError), e:   self.ui.write_err(str(e) + '\n')
Change 1 of 3 Show Entire File tortoisehg/​util/​hglib.py Stacked
 
12
13
14
15
 
16
 
17
18
19
 
512
513
514
515
 
516
517
518
 
709
710
711
 
 
 
 
 
 
 
 
 
 
12
13
14
 
15
16
17
18
19
20
 
513
514
515
 
516
517
518
519
 
710
711
712
713
714
715
716
717
718
719
720
721
@@ -12,8 +12,9 @@
 import urllib    from mercurial import ui, util, extensions, match, bundlerepo, cmdutil -from mercurial import dispatch, encoding, templatefilters, filemerge, error +from mercurial import encoding, templatefilters, filemerge, error  from mercurial import demandimport, revset +from mercurial import dispatch as hgdispatch    demandimport.disable()  try: @@ -512,7 +513,7 @@
  u = Qui()   oldterm = os.environ.get('TERM')   os.environ['TERM'] = 'dumb' - ret = dispatch._dispatch(u, list(args)) + ret = dispatch(u, list(args))   if oldterm:   os.environ['TERM'] = oldterm   return ret @@ -709,3 +710,12 @@
  linesep = sep   break   return linesep + +def dispatch(ui, args): + if hasattr(hgdispatch, 'request'): + # hg >= 1.9, see mercurial changes 08bfec2ef031, 80c599eee3f3 + req = hgdispatch.request(args, ui) + hgdispatch._dispatch(req) + else: + # hg <= 1.8 + hgdispatch._dispatch(ui, args)