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

hggtk: more import pruning

Changeset a05aebba91df…

Parent d0eacc88f1a3…

by Steve Borho

Changes to 8 files · Browse files at a05aebba91df Showing diff from parent d0eacc88f1a3 Diff from another changeset...

Change 1 of 1 Show Entire File hggtk/​backout.py Stacked
 
5
6
7
8
9
10
11
 
5
6
7
 
8
9
10
@@ -5,7 +5,6 @@
 # Copyright (C) 2007 TK Soh <teekaysoh@gmail.com>  #   -import os  import gtk  import gobject  import pango
Change 1 of 1 Show Entire File hggtk/​gdialog.py Stacked
 
10
11
12
13
14
15
16
17
18
19
20
21
22
 
10
11
12
 
13
14
 
15
 
 
16
17
18
@@ -10,13 +10,9 @@
 import threading  import cStringIO  import sys -import shlex  import shutil  import tempfile -  import gtk -import gobject -import pango    from mercurial.node import short  from mercurial import cmdutil, util, ui, hg, commands
Change 1 of 1 Show Entire File hggtk/​gtklib.py Stacked
 
10
11
12
13
 
14
15
16
 
10
11
12
 
13
14
15
16
@@ -10,7 +10,7 @@
 import pango    from thgutil.i18n import _ -from thgutil import hglib, paths +from thgutil import paths    def set_tortoise_icon(window, thgicon):   ico = paths.get_tortoise_icon(thgicon)
Change 1 of 2 Show Changes Only hggtk/​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
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
 #  # Gtk UI class TortoiseHg  #  # Copyright (C) 2007 TK Soh <teekaysoh@gmail.com>  #   -import sys  import gtk -import gobject -import pango  import Queue  import urllib2    from mercurial import ui, util    from thgutil.i18n import _  from thgutil import hglib -from thgutil import shlib  from thgutil import thread2    from hggtk import dialog  from hggtk import 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, dialogq=None, responseq=None,   parentui=None):   if parentui:   # Mercurial 1.2   super(GtkUi, self).__init__(parentui=parentui)   src = parentui   else:   # Mercurial 1.3   super(GtkUi, self).__init__(src)   if src:   self.outputq = src.outputq   self.dialogq = src.dialogq   self.responseq = src.responseq   else:   self.outputq = outputq   self.dialogq = dialogq   self.responseq = responseq   self.setconfig('ui', 'interactive', 'on')     def write(self, *args):   if hglib.uiwrite(self, args):   for a in args:   self.outputq.put(str(a))     def write_err(self, *args):   for a in args:   self.outputq.put('*** ' + str(a))     def flush(self):   pass     def prompt(self, msg, choices=None, default="y"):   import re   if not hglib.calliffunc(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'))     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      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.dialogq = Queue.Queue()   self.responseq = Queue.Queue()   self.ui = GtkUi(None, self.outputq, self.dialogq, self.responseq)   self.args = args   self.ret = None   self.postfunc = postfunc   self.parent = parent   thread2.Thread.__init__(self)     def getqueue(self):   return self.outputq     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:   raise util.Abort('No response')   else:   self.responseq.put(chr(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:   ret = None   if hasattr(self.ui, 'copy'):   # Mercurial 1.3   ret = hglib.dispatch._dispatch(self.ui, self.args)   else:   # Mercurial 1.2   # Some commands create repositories, and thus must create   # new ui() instances. For those, we monkey-patch ui.ui()   # as briefly as possible.   origui = None   if self.args[0] in ('clone', 'init'):   origui = ui.ui   ui.ui = GtkUi   try:   ret = hglib.thgdispatch(self.ui, None, self.args)   finally:   if origui:   ui.ui = origui   if ret:   self.ui.write(_('[command returned code %d]\n') % int(ret))   else:   self.ui.write(_('[command completed successfully]\n'))   self.ret = ret or 0   if self.postfunc:   self.postfunc(ret)   except hglib.RepoError, e:   self.ui.write_err(str(e))   except util.Abort, e:   self.ui.write_err(str(e))   except urllib2.HTTPError, e:   self.ui.write_err(str(e) + '\n')   except Exception, e:   self.ui.write_err(str(e))
Change 1 of 1 Show Entire File hggtk/​logfilter.py Stacked
 
4
5
6
 
7
8
9
10
11
12
 
4
5
6
7
8
 
 
9
10
11
@@ -4,9 +4,8 @@
 # Copyright (C) 2007 TK Soh <teekaysoh@gmail.com>  #   +import os  import gtk -import os -import sys    from mercurial import cmdutil, util, hg, ui  
Change 1 of 1 Show Entire File hggtk/​status.py Stacked
 
12
13
14
15
16
17
18
 
12
13
14
 
15
16
17
@@ -12,7 +12,6 @@
 import gtk  import gobject  import pango -import gobject    from mercurial import cmdutil, util, commands, patch, mdiff  from mercurial import merge as merge_
Change 1 of 1 Show Entire File hggtk/​thgshelve.py Stacked
 
12
13
14
15
 
16
17
18
 
12
13
14
 
15
16
17
18
@@ -12,7 +12,7 @@
 from thgutil.i18n import _    from status import GStatus, FM_STATUS, FM_CHECKED, DM_CHUNK_ID, DM_REJECTED -from hggtk import hgshelve +from hggtk import hgshelve, gdialog    class GShelve(GStatus):   """GTK+ based dialog for displaying repository status and shelving changes.
Change 1 of 1 Show Entire File hggtk/​update.py Stacked
 
6
7
8
 
9
10
11
 
6
7
8
9
10
11
12
@@ -6,6 +6,7 @@
   import os  import gtk +import gobject    from mercurial import hg, ui