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 Entire File hggtk/​clone.py Stacked
 
10
11
12
13
14
15
16
 
10
11
12
 
13
14
15
@@ -10,7 +10,6 @@
 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):
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 Changes Only hggtk/​merge.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
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
 #  # merge.py - TortoiseHg's dialog for merging revisions  #  # Copyright (C) 2007 TK Soh <teekaysoh@gmail.com>  #    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  import shlib  import histselect  import hglib    class MergeDialog(gtk.Window):   """ Dialog to merge revisions of a Mercurial repo """   def __init__(self, root='', rev=''):   """ Initialize the Dialog """   gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)   shlib.set_tortoise_icon(self, 'menumerge.ico')   shlib.set_tortoise_keys(self)     # set dialog title   title = "hg merge"   if root: title += " - %s" % root   self.set_title(title)     self.root = root or hglib.rootpath()   self.rev = rev   self.repo = None   self.notify_func = None   self._create()     def set_notify_func(self, func, *args):   self.notify_func = func   self.notify_args = args     def _create(self):   self.set_default_size(350, 120)     # add toolbar with tooltips   self.tbar = gtk.Toolbar()   self.tips = gtk.Tooltips()     self._btn_merge = self._toolbutton(   gtk.STOCK_CONNECT,   _('merge'),   self._btn_merge_clicked,   menu=self._merge_menu(),   tip=_('Merge working revision with selected revision'))   self._btn_unmerge = self._toolbutton(   gtk.STOCK_DISCONNECT,   _('unmerge'),   self._btn_unmerge_clicked,   tip=_('Undo merging and return working directory to'   ' one of it parent revision'))   tbuttons = [   self._btn_merge,   gtk.SeparatorToolItem(),   self._btn_unmerge   ]   for btn in tbuttons:   self.tbar.insert(btn, -1)   vbox = gtk.VBox()   self.add(vbox)   vbox.pack_start(self.tbar, False, False, 2)     # repo parent revisions   parentbox = gtk.HBox()   lbl = gtk.Label(_('Parent revision(s):'))   lbl.set_property('width-chars', 18)   lbl.set_alignment(0, 0.5)   self._parent_revs = gtk.Entry()   parentbox.pack_start(lbl, False, False)   parentbox.pack_start(self._parent_revs, True, True)   vbox.pack_start(parentbox, False, False, 2)     # revision input   revbox = gtk.HBox()   self._rev_lbl = gtk.Label(_('Merge with revision:'))   self._rev_lbl.set_property('width-chars', 18)   self._rev_lbl.set_alignment(0, 0.5)     # revisions combo box   self._revlist = gtk.ListStore(str, str)   self._revbox = gtk.ComboBoxEntry(self._revlist, 0)     # add extra column to droplist for type of changeset   cell = gtk.CellRendererText()   self._revbox.pack_start(cell)   self._revbox.add_attribute(cell, 'text', 1)   self._rev_input = self._revbox.get_child()     self._btn_rev_browse = gtk.Button(_('Browse...'))   self._btn_rev_browse.connect('clicked', self._btn_rev_clicked)   revbox.pack_start(self._rev_lbl, False, False)   revbox.pack_start(self._revbox, False, False)   revbox.pack_start(self._btn_rev_browse, False, False, 5)   vbox.pack_start(revbox, False, False, 2)     # show them all   self._refresh()     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 _refresh(self):   """ update display on dialog with recent repo data """   try:   # FIXME: force hg to refresh parents info   del self.repo   self.repo = hg.repository(ui.ui(), path=self.root)   except hglib.RepoError:   return None     # populate parent rev data   self._parents = [x.node() for x in self.repo.changectx(None).parents()]   self._parent_revs.set_sensitive(True)   self._parent_revs.set_text(", ".join([short(x) for x in self._parents]))   self._parent_revs.set_sensitive(False)     # condition some widgets per state of working directory   is_merged = len(self._parents) > 1   if is_merged:   self._btn_merge.set_sensitive(False)   self._btn_unmerge.set_sensitive(True)   self._rev_lbl.set_text(_('Unmerge to revision:'))   self._btn_rev_browse.set_sensitive(False)   else:   self._btn_merge.set_sensitive(True)   self._btn_unmerge.set_sensitive(False)   self._rev_lbl.set_text(_('Merge with revision:'))   self._btn_rev_browse.set_sensitive(True)     # populate revision data   heads = self.repo.heads()   tip = self.repo.changelog.node(nullrev+len(self.repo.changelog))   self._revlist.clear()   self._rev_input.set_text("")   for i, node in enumerate(heads):   if node in self._parents and not is_merged:   continue     status = "head %d" % (i+1)   if node == tip:   status += ", tip"     self._revlist.append([short(node), "(%s)" %status])   self._rev_input.set_text(short(node))     if self.rev:   self._rev_input.set_text(str(self.rev))     def _merge_menu(self):   menu = gtk.Menu()     self._chbox_force = gtk.CheckMenuItem(_('Allow merge with uncommited changes'))   menu.append(self._chbox_force)     menu.show_all()   return menu     def _btn_rev_clicked(self, button):   """ select revision from history dialog """   rev = histselect.select(self.root)   if rev is not None:   self._rev_input.set_text(rev)     def _btn_merge_clicked(self, toolbutton, data=None):   self._do_merge()     def _btn_unmerge_clicked(self, toolbutton, data=None):   self._do_unmerge()     def _do_unmerge(self):   rev = self._rev_input.get_text()     if not rev:   error_dialog(self, _('Cannot unmerge'),   _('please select revision to unmerge'))   return     response = question_dialog(self, _('Undo merge'),   _('and checkout revision %s?') % rev)   if response != gtk.RESPONSE_YES:   return     cmdline = ['hg', 'update', '-R', self.root, '--rev', rev,   '--clean', '--verbose']   dlg = CmdDialog(cmdline)   dlg.run()   dlg.hide()   if self.notify_func:   self.notify_func(self.notify_args)   shlib.shell_notify([self.root])   self._refresh()     def _do_merge(self):   rev = self._rev_input.get_text()   force = self._chbox_force.get_active()     if not rev:   error_dialog(self, _('Cannot merge'),   _('please enter revision to merge'))   return     response = question_dialog(self, _('Really want to merge?'),   _('with revision %s') % rev)   if response != gtk.RESPONSE_YES:   return     cmdline = ['hg', 'merge', '-R', self.root, '--rev', rev]   if force:   cmdline.append("--force")     dlg = CmdDialog(cmdline)   dlg.run()   dlg.hide()   shlib.shell_notify([self.root])   if self.notify_func:   self.notify_func(self.notify_args)   self._refresh()    def run(ui, *pats, **opts):   return MergeDialog()
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