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

hggtk: use 'from hggtk' to import hggtk modules

Changeset d0eacc88f1a3…

Parent 08ac1319a4a0…

by Steve Borho

Changes to 27 files · Browse files at d0eacc88f1a3 Showing diff from parent 08ac1319a4a0 Diff from another changeset...

Change 1 of 1 Show Entire File hggtk/​about.py Stacked
 
7
8
9
10
11
12
13
14
 
15
16
17
 
7
8
9
 
10
11
12
13
14
15
16
17
@@ -7,11 +7,11 @@
 import os  import sys  import gtk -import gtklib  from thgutil.i18n import _  from thgutil.hglib import hgversion  from thgutil import shlib  from thgutil import paths +from hggtk import gtklib    def browse_url(url):   import threading
Change 1 of 1 Show Entire File hggtk/​backout.py Stacked
 
13
14
15
16
 
17
18
19
 
13
14
15
 
16
17
18
19
@@ -13,7 +13,7 @@
 from mercurial import hg, ui  from thgutil.i18n import _  from thgutil import hglib, paths -import gtklib +from hggtk import gtklib    class BackoutDialog(gtk.Window):   """ Backout effect of a changeset """
Change 1 of 1 Show Entire File hggtk/​bugreport.py Stacked
 
11
12
13
14
15
 
 
16
17
18
 
11
12
13
 
 
14
15
16
17
18
@@ -11,8 +11,8 @@
 from mercurial import extensions  from thgutil.i18n import _  from thgutil import shlib -from gdialog import GDialog -from about import hgversion +from hggtk.gdialog import GDialog +from hggtk.about import hgversion    class BugReport(GDialog):   """GTK+ based dialog for displaying traceback info to the user in a
Change 1 of 1 Show Entire File hggtk/​changeset.py Stacked
 
17
18
19
20
21
 
 
22
23
24
 
17
18
19
 
 
20
21
22
23
24
@@ -17,8 +17,8 @@
 from thgutil.hglib import *  from thgutil import shlib   -from gdialog import GDialog, Confirm, NativeSaveFileDialogWrapper -import gtklib +from hggtk.gdialog import GDialog, Confirm, NativeSaveFileDialogWrapper +from hggtk import gtklib    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
17
 
10
11
12
 
 
13
14
15
16
17
@@ -10,8 +10,8 @@
 from mercurial import ui, util  from thgutil.i18n import _  from thgutil import shlib -import gdialog -import gtklib +from hggtk import gdialog +from hggtk import gtklib    class CloneDialog(gtk.Window):   """ Dialog to clone a Mercurial repo """
Change 1 of 1 Show Entire File hggtk/​commit.py Stacked
 
21
22
23
24
25
26
27
 
 
 
 
28
29
30
 
21
22
23
 
 
 
 
24
25
26
27
28
29
30
@@ -21,10 +21,10 @@
 from thgutil import hglib  from thgutil import shlib   -from status import GStatus, FM_STATUS, FM_CHECKED, FM_PATH_UTF8 -from status import DM_REJECTED, DM_CHUNK_ID -import gtklib -import gdialog +from hggtk.status import GStatus, FM_STATUS, FM_CHECKED, FM_PATH_UTF8 +from hggtk.status import DM_REJECTED, DM_CHUNK_ID +from hggtk import gtklib +from hggtk import gdialog    class BranchOperationDialog(gtk.Dialog):   def __init__(self, branch, close):
Change 1 of 1 Show Entire File hggtk/​datamine.py Stacked
 
20
21
22
23
24
 
 
25
26
27
 
20
21
22
 
 
23
24
25
26
27
@@ -20,8 +20,8 @@
 from logview.colormap import AnnotateColorMap, AnnotateColorSaturation  from logview.treeview import TreeView as LogTreeView   -import gtklib -import gdialog +from hggtk import gtklib +from hggtk import gdialog    class DataMineDialog(gdialog.GDialog):   COL_REVID = 0
Change 1 of 1 Show Entire File hggtk/​dialog.py Stacked
 
16
17
18
19
 
20
21
22
 
16
17
18
 
19
20
21
22
@@ -16,7 +16,7 @@
   import gtk  from thgutil.i18n import _ -import gtklib +from hggtk import gtklib    def entry_dialog(parent, msg, visible=True, default='', respfunc=None):   """ Allow a user to enter a text string (username/password)
Change 1 of 1 Show Entire File hggtk/​gdialog.py Stacked
 
24
25
26
27
 
28
29
30
 
24
25
26
 
27
28
29
30
@@ -24,7 +24,7 @@
 from thgutil.i18n import _  from thgutil import shlib, hglib, paths   -import gtklib +from hggtk import gtklib    class SimpleMessage(gtklib.MessageDialog):   def run(self):
Change 1 of 1 Show Entire File hggtk/​guess.py Stacked
 
18
19
20
21
 
22
23
24
 
18
19
20
 
21
22
23
24
@@ -18,7 +18,7 @@
 from thgutil.hglib import toutf, fromutf, diffexpand, RepoError  from thgutil import shlib, paths, thread2   -import gtklib +from hggtk import gtklib    # This function and some key bits below borrowed ruthelessly from  # Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
Change 1 of 1 Show Entire File hggtk/​hgcmd.py Stacked
 
14
15
16
17
18
 
 
19
20
21
 
14
15
16
 
 
17
18
19
20
21
@@ -14,8 +14,8 @@
 from thgutil import shlib  from thgutil import hglib   -import gtklib -import hgthread +from hggtk import gtklib +from hggtk import hgthread    class CmdDialog(gtk.Dialog):   def __init__(self, cmdline, progressbar=True, width=520, height=400):
Change 1 of 1 Show Entire File hggtk/​hgemail.py Stacked
 
18
19
20
21
22
 
 
23
24
25
 
18
19
20
 
 
21
22
23
24
25
@@ -18,8 +18,8 @@
 from thgutil import hglib  from thgutil import shlib   -import gtklib -import dialog +from hggtk import gtklib +from hggtk import dialog    class EmailDialog(gtk.Window):   """ Send patches or bundles via email """
Change 1 of 1 Show Entire File hggtk/​hgignore.py Stacked
 
13
14
15
16
 
17
18
19
 
13
14
15
 
16
17
18
19
@@ -13,7 +13,7 @@
 from thgutil.i18n import _  from thgutil import shlib, hglib, paths   -import gtklib +from hggtk import gtklib    class HgIgnoreDialog(gtk.Window):   'Edit a reposiory .hgignore file'
Change 1 of 1 Show Entire File hggtk/​hginit.py Stacked
 
13
14
15
16
17
 
 
18
19
20
 
13
14
15
 
 
16
17
18
19
20
@@ -13,8 +13,8 @@
 from thgutil import hglib  from thgutil import shlib   -import dialog -import gtklib +from hggtk import dialog +from hggtk import gtklib    class InitDialog(gtk.Window):   """ Dialog to initialize a Mercurial repo """
Change 1 of 1 Show Entire File hggtk/​hgthread.py Stacked
 
18
19
20
21
22
 
 
23
24
25
 
18
19
20
 
 
21
22
23
24
25
@@ -18,8 +18,8 @@
 from thgutil import shlib  from thgutil import thread2   -import dialog -import gdialog +from hggtk import dialog +from hggtk import gdialog    class GtkUi(ui.ui):   '''
Change 1 of 1 Show Entire File hggtk/​history.py Stacked
 
22
23
24
25
 
26
27
28
 
22
23
24
 
25
26
27
28
@@ -22,7 +22,7 @@
 from logview import treemodel  from logview.treeview import TreeView as LogTreeView   -import gtklib +from hggtk import gtklib    def create_menu(label, callback):   menuitem = gtk.MenuItem(label, True)
Change 1 of 1 Show Entire File hggtk/​logfilter.py Stacked
 
13
14
15
16
 
17
18
19
 
13
14
15
 
16
17
18
19
@@ -13,7 +13,7 @@
 from thgutil.i18n import _  from thgutil import hglib   -import gtklib +from hggtk import gtklib    class FilterDialog(gtk.Dialog):   """ Dialog for creating log filters """
Change 1 of 1 Show Entire File hggtk/​merge.py Stacked
 
13
14
15
16
17
18
 
 
 
19
20
21
 
13
14
15
 
 
 
16
17
18
19
20
21
@@ -13,9 +13,9 @@
 from thgutil.i18n import _  from thgutil import hglib, paths   -import gtklib -import gdialog -import hgcmd +from hggtk import gtklib +from hggtk import gdialog +from hggtk import hgcmd    class MergeDialog(gtk.Window):   """ Dialog to merge revisions of a Mercurial repo """
Change 1 of 1 Show Changes Only hggtk/​recovery.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
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
 #  # Repository recovery dialog for TortoiseHg  #  # Copyright (C) 2007 Steve Borho <steve@borho.org>  # Copyright (C) 2007 TK Soh <teekaysoh@gmail.com>  #    import gtk  import gobject  import pango  import Queue  import os    from mercurial import hg, ui    from thgutil.i18n import _  from thgutil import hglib, shlib, paths   -import gdialog -import dialog -import gtklib -import hgthread +from hggtk import gdialog, dialog, gtklib, hgthread    class RecoveryDialog(gtk.Window):   def __init__(self):   """ Initialize the Dialog. """   gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)   gtklib.set_tortoise_icon(self, 'general.ico')   gtklib.set_tortoise_keys(self)     self.root = paths.find_root()   self.selected_path = None   self.hgthread = None   self.connect('delete-event', self._delete)     self.set_default_size(600, 400)     name = os.path.basename(os.path.abspath(self.root))   self.set_title(_('TortoiseHg Recovery - ') + name)     # toolbar   self.tbar = gtk.Toolbar()   self.tips = gtk.Tooltips()   self._stop_button = self._toolbutton(gtk.STOCK_STOP,   _('Stop'), self._stop_clicked, tip=_('Stop the hg operation'))   self._stop_button.set_sensitive(False)   tbuttons = [   self._toolbutton(gtk.STOCK_CLEAR,   _('clean'),   self._clean_clicked,   tip=_('Clean checkout, undo all changes')),   gtk.SeparatorToolItem(),   self._toolbutton(gtk.STOCK_UNDO,   _('rollback'),   self._rollback_clicked,   tip=_('Rollback (undo) last transaction to'   ' repository (pull, commit, etc)')),   gtk.SeparatorToolItem(),   self._toolbutton(gtk.STOCK_CLEAR,   _('recover'),   self._recover_clicked,   tip=_('Recover from interrupted operation')),   gtk.SeparatorToolItem(),   self._toolbutton(gtk.STOCK_APPLY,   _('verify'),   self._verify_clicked,   tip=_('Validate repository consistency')),   gtk.SeparatorToolItem(),   self._stop_button,   gtk.SeparatorToolItem(),   ]   for btn in tbuttons:   self.tbar.insert(btn, -1)   vbox = gtk.VBox()   self.add(vbox)   vbox.pack_start(self.tbar, False, False, 2)     # hg output window   scrolledwindow = gtk.ScrolledWindow()   scrolledwindow.set_shadow_type(gtk.SHADOW_ETCHED_IN)   scrolledwindow.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)   self.textview = gtk.TextView(buffer=None)   self.textview.set_editable(False)   self.textview.modify_font(pango.FontDescription('Monospace'))   scrolledwindow.add(self.textview)   self.textview.set_editable(False)   self.textbuffer = self.textview.get_buffer()   vbox.pack_start(scrolledwindow, True, True)     self.stbar = gtklib.StatusBar()   vbox.pack_start(self.stbar, False, False, 2)     def _delete(self, widget, event):   if not self.should_live():   self.destroy()   return True     def should_live(self):   if self._cmd_running():   dialog.error_dialog(self, _('Cannot close now'),   _('command is running'))   return True   return False     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 _clean_clicked(self, toolbutton, data=None):   response = gdialog.Confirm(_('Confirm clean repository'), [], self,   "%s ?" % os.path.basename(self.root)).run()   if response != gtk.RESPONSE_YES:   return   try:   repo = hg.repository(ui.ui(), path=self.root)   except hglib.RepoError:   self.write(_('Unable to find repo at %s\n') % (self.root), False)   return   pl = repo.changectx(None).parents()   cmd = ['update', '--clean', '--rev', str(pl[0].rev())]   self._exec_cmd(cmd, postfunc=self._notify)     def _notify(self, ret, *args):   import time   time.sleep(0.5) # give fs some time to pick up changes   shlib.shell_notify([self.root])     def _rollback_clicked(self, toolbutton, data=None):   response = gdialog.Confirm(_('Confirm rollback repository'), [], self,   "%s ?" % os.path.basename(self.root)).run()   if response != gtk.RESPONSE_YES:   return   cmd = ['rollback']   self._exec_cmd(cmd, postfunc=self._notify)     def _recover_clicked(self, toolbutton, data=None):   cmd = ['recover']   self._exec_cmd(cmd)     def _verify_clicked(self, toolbutton, data=None):   cmd = ['verify']   self._exec_cmd(cmd)     def _stop_clicked(self, toolbutton, data=None):   if self.hgthread and self.hgthread.isAlive():   self.hgthread.terminate()   self._stop_button.set_sensitive(False)     def _exec_cmd(self, cmd, postfunc=None):   if self._cmd_running():   dialog.error_dialog(self, _('Cannot run now'),   _('Please try again after the previous command is completed'))   return     self._stop_button.set_sensitive(True)   cmdline = cmd   cmdline.append('--verbose')   cmdline.append('--repository')   cmdline.append(self.root)     # show command to be executed   self.write("", False)     # execute command and show output on text widget   gobject.timeout_add(10, self.process_queue)   self.hgthread = hgthread.HgThread(cmdline, postfunc)   self.hgthread.start()   self.stbar.begin()   self.stbar.set_status_text('hg ' + ' '.join(cmdline))     def _cmd_running(self):   if self.hgthread and self.hgthread.isAlive():   return True   else:   return False     def write(self, msg, append=True):   msg = hglib.toutf(msg)   if append:   enditer = self.textbuffer.get_end_iter()   self.textbuffer.insert(enditer, msg)   else:   self.textbuffer.set_text(msg)     def process_queue(self):   """   Handle all the messages currently in the queue (if any).   """   self.hgthread.process_dialogs()   while self.hgthread.getqueue().qsize():   try:   msg = self.hgthread.getqueue().get(0)   self.write(msg)   except Queue.Empty:   pass   if self._cmd_running():   return True   else:   self.stbar.end()   self._stop_button.set_sensitive(False)   if self.hgthread.return_code() is None:   self.write(_('[command interrupted]'))   return False # Stop polling this function    def run(ui, *pats, **opts):   return RecoveryDialog()
Change 1 of 1 Show Entire File hggtk/​serve.py Stacked
 
22
23
24
25
26
27
 
28
29
30
 
22
23
24
 
 
 
25
26
27
28
@@ -22,9 +22,7 @@
 from thgutil.i18n import _  from thgutil import hglib, paths   -import dialog -import gdialog -import gtklib +from hggtk import dialog, gdialog, gtklib    gservice = None  class ServeDialog(gtk.Window):
Change 1 of 1 Show Entire File hggtk/​status.py Stacked
 
20
21
22
23
24
25
26
 
 
27
28
29
 
20
21
22
 
 
 
 
23
24
25
26
27
@@ -20,10 +20,8 @@
 from thgutil.i18n import _  from thgutil import hglib, shlib, paths   -from gdialog import GDialog, Confirm, Prompt, NativeSaveFileDialogWrapper -import dialog -import hgshelve -import gtklib +from hggtk.gdialog import GDialog, Confirm, Prompt, NativeSaveFileDialogWrapper +from hggtk import dialog, hgshelve, gtklib    # file model row enumerations  FM_CHECKED = 0
Change 1 of 1 Show Entire File hggtk/​synch.py Stacked
 
17
18
19
20
21
22
 
23
24
25
 
17
18
19
 
 
 
20
21
22
23
@@ -17,9 +17,7 @@
 from thgutil.i18n import _  from thgutil import hglib, shlib, paths   -import dialog -import gtklib -import hgthread +from hggtk import dialog, gtklib, hgthread    class SynchDialog(gtk.Window):   def __init__(self, repos=[], pushmode=False):
Change 1 of 1 Show Entire File hggtk/​tagadd.py Stacked
 
14
15
16
17
18
 
19
20
21
 
14
15
16
 
 
17
18
19
20
@@ -14,8 +14,7 @@
 from thgutil.i18n import _  from thgutil import hglib   -import dialog -import gtklib +from hggtk import dialog, gtklib    class TagAddDialog(gtk.Window):   """ Dialog to add tag to Mercurial repo """
Change 1 of 1 Show Entire File hggtk/​thgconfig.py Stacked
 
16
17
18
19
20
21
 
22
23
24
 
16
17
18
 
 
 
19
20
21
22
@@ -16,9 +16,7 @@
 from thgutil.i18n import _  from thgutil import hglib, shlib, paths, iniparse   -import dialog -import gdialog -import gtklib +from hggtk import dialog, gdialog, gtklib    _unspecstr = _('<unspecified>')  
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 -import hgshelve +from hggtk import hgshelve    class GShelve(GStatus):   """GTK+ based dialog for displaying repository status and shelving changes.
Change 1 of 1 Show Entire File hggtk/​update.py Stacked
 
12
13
14
15
16
 
17
18
19
 
12
13
14
 
 
15
16
17
18
@@ -12,8 +12,7 @@
 from thgutil.i18n import _  from thgutil import hglib, paths   -import hgcmd -import gtklib +from hggtk import hgcmd, gtklib    _branch_tip_ = _('= Current Branch Tip =')  
Change 1 of 1 Show Entire File hggtk/​visdiff.py Stacked
 
21
22
23
24
25
 
26
27
28
 
21
22
23
 
 
24
25
26
27
@@ -21,8 +21,7 @@
 from thgutil.i18n import _  from thgutil import hglib, shlib, paths   -import gdialog -import gtklib +from hggtk import gdialog, gtklib    try:   import win32con