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

hggtk: eliminate "from ... import *" for easier understandable code

replaced with explicit imports
removed found unnecessary imports

Changeset 8098f20d7996…

Parent a2d48eb8e9df…

by Simon Heimberg

Changes to 13 files · Browse files at 8098f20d7996 Showing diff from parent a2d48eb8e9df Diff from another changeset...

Change 1 of 1 Show Entire File hggtk/​backout.py Stacked
 
8
9
10
11
 
12
13
14
 
8
9
10
 
11
12
13
14
@@ -8,7 +8,7 @@
 import os  import gtk  import pango -from dialog import * +from dialog import GDialog  from hgcmd import CmdDialog  from mercurial.i18n import _  import histselect
Change 1 of 1 Show Entire File hggtk/​bugreport.py Stacked
 
8
9
10
11
 
12
13
14
 
8
9
10
 
11
12
13
14
@@ -8,7 +8,7 @@
 import pango  from mercurial.i18n import _  from hglib import toutf, fromutf, rootpath, diffexpand -from gdialog import * +from gdialog import GDialog  from dialog import entry_dialog    class BugReport(GDialog):
Change 1 of 1 Show Entire File hggtk/​changeset.py Stacked
 
10
11
12
13
 
14
15
 
16
17
18
 
19
20
21
 
10
11
12
 
13
14
 
15
16
17
18
19
20
21
22
@@ -10,12 +10,13 @@
 import pango  import StringIO   -from mercurial.node import * +from mercurial.node import short, nullrev  from mercurial import cmdutil, context, util, ui, hg, patch -from gdialog import * +from gdialog import GDialog, Confirm  from hgcmd import CmdDialog  from hglib import toutf, fromutf, displaytime, hgcmd_toq, diffexpand, LookupError  from gtklib import StatusBar +from shlib import shell_notify    class ChangeSet(GDialog):   """GTK+ based dialog for displaying repository logs
Change 1 of 1 Show Changes Only hggtk/​clone.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
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
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
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
 #  # TortoiseHg dialog to clone a repo  #  # Copyright (C) 2007 TK Soh <teekaysoh@gmail.com>  #    import gtk  import os  import pango  from dialog import question_dialog, error_dialog, info_dialog  from mercurial import hg, ui, cmdutil, util  from mercurial.i18n import _ -from mercurial.node import *  import shlib    class CloneDialog(gtk.Window):   """ Dialog to add tag to Mercurial repo """   def __init__(self, repos=[]):   """ Initialize the Dialog """   gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)   shlib.set_tortoise_icon(self, 'menuclone.ico')   shlib.set_tortoise_keys(self)     # set dialog title   title = 'hg clone'   self.set_title(title)     self._settings = shlib.Settings('clone')   self._recent_src = self._settings.mrul('src_paths')   self._recent_dest = self._settings.mrul('dest_paths')     sync_settings = shlib.Settings('synch')   self._sync_src = sync_settings.mrul('src_paths')     self._src_path = os.getcwd()   self._dest_path = self._src_path   if len(repos) > 1:   self._src_path = repos[0]   self._dest_path = repos[1]   elif len(repos):   self._src_path = repos[0]     # build dialog   self._create()     def _create(self):   self.set_default_size(520, 180)   self.connect('destroy', gtk.main_quit)   ewidth = 16     # add toolbar with tooltips   self.tbar = gtk.Toolbar()   self.tips = gtk.Tooltips()     self._btn_clone = self._toolbutton(   gtk.STOCK_COPY,   _('clone'),   self._btn_clone_clicked,   tip=_('Clone a repository'))   tbuttons = [   self._btn_clone,   ]   for btn in tbuttons:   self.tbar.insert(btn, -1)   vbox = gtk.VBox()   self.add(vbox)   vbox.pack_start(self.tbar, False, False, 2)     # clone source   srcbox = gtk.HBox()   lbl = gtk.Label(_('Source Path:'))   lbl.set_property('width-chars', ewidth)   lbl.set_alignment(0, 0.5)     # create drop-down list for source paths   self._srclist = gtk.ListStore(str)   self._srclistbox = gtk.ComboBoxEntry(self._srclist, 0)   self._src_input = self._srclistbox.get_child()   self._src_input.set_text(self._src_path)   self._src_input.set_position(-1)     # replace the drop-down widget so we can modify it's properties   self._srclistbox.clear()   cell = gtk.CellRendererText()   cell.set_property('ellipsize', pango.ELLIPSIZE_MIDDLE)   self._srclistbox.pack_start(cell)   self._srclistbox.add_attribute(cell, 'text', 0)     self._btn_src_browse = gtk.Button(_('Browse...'))   self._btn_src_browse.connect('clicked', self._btn_src_clicked)   srcbox.pack_start(lbl, False, False)   srcbox.pack_start(self._srclistbox, True, True)   srcbox.pack_end(self._btn_src_browse, False, False, 5)   vbox.pack_start(srcbox, False, False, 2)     # add pre-defined src paths to pull-down list   sympaths = [x[1] for x in ui.ui().configitems('paths')]   recent = [x for x in self._recent_src]   syncsrc = [x for x in self._sync_src]   paths = list(set(sympaths + recent + syncsrc))   paths.sort()   for p in paths:   self._srclist.append([p])     # clone destination   destbox = gtk.HBox()   lbl = gtk.Label(_('Destination Path:'))   lbl.set_property('width-chars', ewidth)   lbl.set_alignment(0, 0.5)   self._destlist = gtk.ListStore(str)   self._destlistbox = gtk.ComboBoxEntry(self._destlist, 0)   self._dest_input = self._destlistbox.get_child()   self._dest_input.set_text(self._dest_path)   self._dest_input.set_position(-1)     # replace the drop-down widget so we can modify it's properties   self._destlistbox.clear()   cell = gtk.CellRendererText()   cell.set_property('ellipsize', pango.ELLIPSIZE_MIDDLE)   self._destlistbox.pack_start(cell)   self._destlistbox.add_attribute(cell, 'text', 0)     self._btn_dest_browse = gtk.Button(_('Browse...'))   self._btn_dest_browse.connect('clicked', self._btn_dest_clicked)   destbox.pack_start(lbl, False, False)   destbox.pack_start(self._destlistbox, True, True)   destbox.pack_end(self._btn_dest_browse, False, False, 5)   vbox.pack_start(destbox, False, False, 2)     # add most-recent dest paths to pull-down list   paths = list(self._recent_dest)   paths.sort()   for p in paths:   self._destlist.append([p])     # revision input   revbox = gtk.HBox()   lbl = gtk.Label(_('Clone To Revision:'))   lbl.set_property('width-chars', ewidth)   lbl.set_alignment(0, 0.5)   self._rev_input = gtk.Entry()   self._rev_input.set_text("")   self._opt_allrev = gtk.CheckButton(_('Clone all revisions'))   self._opt_allrev.set_active(True)   self._btn_rev_browse = gtk.Button(_('Select...'))   self._btn_rev_browse.connect('clicked', self._btn_rev_clicked)   revbox.pack_start(lbl, False, False)   revbox.pack_start(self._rev_input, False, False)   #revbox.pack_start(self._btn_rev_browse, False, False, 5)   revbox.pack_start(self._opt_allrev, False, False)   vbox.pack_start(revbox, False, False, 2)     # options   option_box = gtk.VBox()   self._opt_update = gtk.CheckButton(_('do not update the new working directory'))   self._opt_pull = gtk.CheckButton(_('use pull protocol to copy metadata'))   self._opt_uncomp = gtk.CheckButton(_('use uncompressed transfer'))   self._opt_proxy = gtk.CheckButton(_('use proxy server'))   option_box.pack_start(self._opt_update, False, False)   option_box.pack_start(self._opt_pull, False, False)   option_box.pack_start(self._opt_uncomp, False, False)   option_box.pack_start(self._opt_proxy, False, False)   vbox.pack_start(option_box, False, False, 15)     if ui.ui().config('http_proxy', 'host', ''):   self._opt_proxy.set_active(True)   else:   self._opt_proxy.set_sensitive(False)     # remote cmd   lbl = gtk.Label(_('Remote Cmd:'))   lbl.set_alignment(0, 0.5)   self._remote_cmd = gtk.Entry()   vbox.pack_end(self._remote_cmd, False, False, 1)   vbox.pack_end(lbl, False, False, 1)     def _toolbutton(self, stock, label, handler,   menu=None, userdata=None, tip=None):   if menu:   tbutton = gtk.MenuToolButton(stock)   tbutton.set_menu(menu)   else:   tbutton = gtk.ToolButton(stock)     tbutton.set_label(label)   if tip:   tbutton.set_tooltip(self.tips, tip)   tbutton.connect('clicked', handler, userdata)   return tbutton     def _btn_dest_clicked(self, button):   """ select folder as clone destination """   dialog = gtk.FileChooserDialog(title=None,   action=gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER,   buttons=(gtk.STOCK_CANCEL,gtk.RESPONSE_CANCEL,   gtk.STOCK_OPEN,gtk.RESPONSE_OK))   dialog.set_default_response(gtk.RESPONSE_OK)   response = dialog.run()   if response == gtk.RESPONSE_OK:   self._dest_input.set_text(dialog.get_filename())   dialog.destroy()     def _btn_src_clicked(self, button):   """ select source folder to clone """   dialog = gtk.FileChooserDialog(title=None,   action=gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER,   buttons=(gtk.STOCK_CANCEL,gtk.RESPONSE_CANCEL,   gtk.STOCK_OPEN,gtk.RESPONSE_OK))   dialog.set_default_response(gtk.RESPONSE_OK)   response = dialog.run()   if response == gtk.RESPONSE_OK:   self._src_input.set_text(dialog.get_filename())   dialog.destroy()     def _btn_rev_clicked(self, button):   """ select revision from history dialog """   import histselect   rev = histselect.select()   if rev is not None:   self._rev_input.set_text(rev)     def _add_src_to_recent(self, src):   if os.path.exists(src):   src = os.path.abspath(src)     # save path to recent list in history   self._recent_src.add(src)   self._settings.write()     # update drop-down list   self._srclist.clear()   sympaths = [x[1] for x in ui.ui().configitems('paths')]   paths = list(set(sympaths + [x for x in self._recent_src]))   paths.sort()   for p in paths:   self._srclist.append([p])     def _add_dest_to_recent(self, dest):   if not dest:   return   if os.path.exists(dest):   dest = os.path.abspath(dest)     # save path to recent list in history   self._recent_dest.add(dest)   self._settings.write()     # update drop down list   paths = list(self._recent_dest)   paths.sort()   self._destlist.clear()   for p in paths:   self._destlist.append([p])     def _btn_clone_clicked(self, toolbutton, data=None):   # gather input data   src = self._src_input.get_text()   dest = self._dest_input.get_text() or os.path.basename(src)   remotecmd = self._remote_cmd.get_text()   rev = self._rev_input.get_text()     # verify input   if src == '':   error_dialog(self, _('Source path is empty'), _('Please enter'))   self._src_input.grab_focus()   return False     if src == dest:   error_dialog(self, _('Source and dest are the same'),   _('Please specify a different destination'))   self._dest_input.grab_focus()   return False     if dest == os.getcwd():   if os.listdir(dest):   # cur dir has files, specify no dest, let hg take   # basename   dest = None   else:   dest = '.'     # start cloning   try:   cmdline = ['hg', 'clone']   if self._opt_update.get_active():   cmdline.append('--noupdate')   if self._opt_uncomp.get_active():   cmdline.append('--uncompressed')   if self._opt_pull.get_active():   cmdline.append('--pull')   if not (self._opt_proxy.get_active() and   ui.ui().config('http_proxy', 'host', '')):   cmdline += ["--config", "http_proxy.host="]   if remotecmd:   cmdline.append('--remotecmd')   cmdline.append(remotecmd)   if not self._opt_allrev.get_active() and rev:   cmdline.append('--rev')   cmdline.append(rev)     cmdline.append('--verbose')   cmdline.append(src)   if dest:   cmdline.append(dest)     from hgcmd import CmdDialog   dlg = CmdDialog(cmdline)   dlg.run()   dlg.hide()   except util.Abort, inst:   error_dialog(self, _('Clone aborted'), str(inst))   return False   except:   import traceback   error_dialog(self, _('Clone error'), traceback.format_exc())   return False     self._add_src_to_recent(src)   self._add_dest_to_recent(dest)    def run(_ui, *pats, **opts):   return CloneDialog(pats)
Change 1 of 1 Show Entire File hggtk/​commit.py Stacked
 
14
15
16
17
18
19
20
21
 
 
 
 
22
23
 
 
24
25
26
 
14
15
16
 
 
 
 
 
17
18
19
20
21
22
23
24
25
26
27
@@ -14,13 +14,14 @@
 import cStringIO    from mercurial.i18n import _ -from mercurial.node import * -from mercurial import ui, hg -from shlib import shell_notify -from gdialog import * -from status import * +from mercurial.node import hex, nullrev +from mercurial import ui, hg, util, patch +from gdialog import Prompt, Confirm +from status import GStatus, FM_STATUS, FM_CHECKED, DM_REJECTED, DM_CHUNK_ID  from hgcmd import CmdDialog  from hglib import fromutf +import shlib +from shlib import shell_notify    class BranchOperationDialog(gtk.Dialog):   def __init__(self, branch, close):
Change 1 of 1 Show Entire File hggtk/​datamine.py Stacked
 
12
13
14
15
 
16
17
18
 
12
13
14
 
15
16
17
18
@@ -12,7 +12,7 @@
 from mercurial import hg, ui, util, revlog  from mercurial.i18n import _  from hglib import hgcmd_toq, toutf, fromutf, gettabwidth, displaytime, LookupError, rootpath -from gdialog import * +from gdialog import GDialog  from vis import treemodel  from vis.colormap import AnnotateColorMap, AnnotateColorSaturation  from vis.treeview import TreeView
Change 1 of 1 Show Entire File hggtk/​hgemail.py Stacked
 
12
13
14
15
 
16
17
18
 
12
13
14
 
15
16
17
18
@@ -12,7 +12,7 @@
 import pango  import shlib  from tempfile import mkstemp -from dialog import * +from dialog import info_dialog  from mercurial import hg, ui, extensions  from mercurial.i18n import _  from hglib import RepoError, fromutf, toutf
Change 1 of 1 Show Entire File hggtk/​hgignore.py Stacked
 
9
10
11
12
13
14
15
 
9
10
11
 
12
13
14
@@ -9,7 +9,6 @@
 import gobject  from mercurial import hg, ui, match  from mercurial.i18n import _ -from dialog import *  import shlib  import hglib  
Change 1 of 1 Show Entire File hggtk/​logfilter.py Stacked
 
7
8
9
10
 
11
12
13
 
7
8
9
 
10
11
12
13
@@ -7,7 +7,7 @@
 import gtk  import os  import sys -from gdialog import * +from gdialog import GDialog  from mercurial import cmdutil, util, hg, ui  from mercurial.i18n import _  from hglib import RepoError
Change 1 of 1 Show Entire File hggtk/​merge.py Stacked
 
6
7
8
9
10
 
 
11
12
13
 
6
7
8
 
 
9
10
11
12
13
@@ -6,8 +6,8 @@
   import gtk  import sys -from dialog import * -from mercurial.node import * +from dialog import error_dialog, question_dialog +from mercurial.node import short, nullrev  from mercurial.i18n import _  from mercurial import util, hg, ui  from hgcmd import CmdDialog
Change 1 of 1 Show Entire File hggtk/​status.py Stacked
 
11
12
13
 
14
15
16
17
18
19
20
 
21
22
23
 
11
12
13
14
15
16
17
18
19
20
 
21
22
23
24
@@ -11,13 +11,14 @@
 import cStringIO  import gtk  import pango +import gobject    from mercurial.i18n import _  from mercurial import cmdutil, util, ui, hg, commands, patch, mdiff, extensions  from mercurial import merge as merge_  from shlib import shell_notify  from hglib import toutf, fromutf, rootpath, diffexpand -from gdialog import * +from gdialog import GDialog, Confirm, Prompt  from dialog import entry_dialog  import hgshelve  
Change 1 of 1 Show Entire File hggtk/​thgshelve.py Stacked
 
13
14
15
16
17
 
 
18
19
20
 
13
14
15
 
 
16
17
18
19
20
@@ -13,8 +13,8 @@
 from mercurial.i18n import _  from mercurial import ui, hg  from shlib import shell_notify -from gdialog import * -from status import * +from gdialog import Confirm +from status import GStatus, FM_STATUS, FM_CHECKED, DM_CHUNK_ID, DM_REJECTED  from hgcmd import CmdDialog  from hglib import fromutf  import hgshelve
Change 1 of 1 Show Entire File hggtk/​update.py Stacked
 
7
8
9
10
 
11
12
 
13
14
15
 
7
8
9
 
10
11
 
12
13
14
15
@@ -7,9 +7,9 @@
 import os  import sys  import gtk -from dialog import * +from dialog import error_dialog, question_dialog  from mercurial import util, hg, ui -from mercurial.node import * +from mercurial.node import short, nullrev  from mercurial.i18n import _  from hglib import rootpath, toutf, RepoError  import shlib