Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.9, 0.9.1, and 0.9.1.1

history: replace MQ icon on toolbar

add 'menupatch.ico' (from TortoiseSVN project)

Changeset 73385d42a916…

Parent ed4c2264d6c5…

by Yuki KODAMA

Changes to 3 files · Browse files at 73385d42a916 Showing diff from parent ed4c2264d6c5 Diff from another changeset...

Change 1 of 2 Show Changes Only hggtk/​gdialog.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
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
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
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
 # gdialog.py - base dialog for gtools  #  # Copyright 2007 Brad Schick, brad at gmail . com  # Copyright 2008 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 os  import threading  import cStringIO  import sys  import shutil  import tempfile  import gtk  import atexit    from mercurial import cmdutil, util, ui, hg, commands    from thgutil.i18n import _  from thgutil import settings, hglib, paths    from hggtk import gtklib    class SimpleMessage(gtklib.MessageDialog):   def run(self):   response = gtklib.MessageDialog.run(self)   self.destroy()   return response      class Prompt(SimpleMessage):   def __init__(self, title, message, parent):   SimpleMessage.__init__(self, parent, gtk.DIALOG_MODAL,   gtk.MESSAGE_INFO, gtk.BUTTONS_CLOSE)   self.set_title(hglib.toutf(title))   self.set_markup('<b>' + hglib.toutf(message) + '</b>')   mod = gtklib.get_thg_modifier()   key, modifier = gtk.accelerator_parse(mod+'Return')   accel_group = gtk.AccelGroup()   self.add_accel_group(accel_group)   buttons = self.get_children()[0].get_children()[1].get_children()   buttons[0].add_accelerator("clicked", accel_group, key,   modifier, gtk.ACCEL_VISIBLE)    class CustomPrompt(gtk.MessageDialog):   ''' Custom prompt dialog. Provide a list of choices with ampersands   to delineate response given for each choice (and keyboard   accelerator). Default must be the index of one of the choice responses.   '''   # ret = CustomPrompt('Title', 'Message', self, ('&Yes', 'N&o'), 1).run()   # ret will be (gtk.RESPONSE_DELETE_EVENT, 0 (for yes), or 1 (for no)   def __init__(self, title, message, parent, choices, default=None, esc=None):   gtk.MessageDialog.__init__(self, parent, gtk.DIALOG_MODAL,   gtk.MESSAGE_QUESTION)   self.set_title(hglib.toutf(title))   self.format_secondary_markup('<b>' + hglib.toutf(message) + '</b>')   accel_group = gtk.AccelGroup()   self.add_accel_group(accel_group)   for i, s in enumerate(choices):   char = s[s.index('&')+1].lower()   button = self.add_button(s.replace('&', '_'), i)   button.add_accelerator('clicked', accel_group, ord(char), 0,   gtk.ACCEL_VISIBLE)   if default:   self.set_default_response(default)   self.esc = esc     def run(self):   response = gtklib.MessageDialog.run(self)   if response == gtk.RESPONSE_DELETE_EVENT and self.esc != None:   response = self.esc   self.destroy()   return response    class Confirm(SimpleMessage):   """Dialog returns gtk.RESPONSE_YES or gtk.RESPONSE_NO   """   def __init__(self, title, files, parent, primary):   SimpleMessage.__init__(self, parent, gtk.DIALOG_MODAL,   gtk.MESSAGE_QUESTION, gtk.BUTTONS_YES_NO)   self.set_title(hglib.toutf(title))   primary = '<b>' + primary + '</b>'   self.set_markup(hglib.toutf(primary))   message = ''   for i, f in enumerate(files):   message += ' ' + f + '\n'   if i == 9:   message += ' ...\n'   break   self.format_secondary_text(hglib.toutf(message))   accel_group = gtk.AccelGroup()   self.add_accel_group(accel_group)   buttons = self.get_children()[0].get_children()[1].get_children()   buttons[1].add_accelerator("clicked", accel_group, ord("y"),   0, gtk.ACCEL_VISIBLE)   buttons[0].add_accelerator("clicked", accel_group, ord("n"),   0, gtk.ACCEL_VISIBLE)      class GDialog(gtk.Window):   """GTK+ based dialog for displaying mercurial information     The following methods are meant to be overridden by subclasses. At this   point GCommit is really the only intended subclass.     parse_opts(self)   get_title(self)   get_minsize(self)   get_defsize(self)   get_tbbuttons(self)   get_body(self)   get_extras(self)   prepare_display(self)   should_live(self, widget, event)   save_settings(self)   load_settings(self, settings)   """     # "Constants"   def __init__(self, ui, repo, cwd, pats, opts):   gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)   self.cwd = cwd or os.getcwd()   self.ui = ui   self.ui.setconfig('ui', 'interactive', 'off')   if repo:   self.repo = repo   else:   root = paths.find_root()   if root:   self.repo = hg.repository(ui, path=root)   else:   self.repo = None   self.pats = pats   self.opts = opts   self.tmproot = None   self.toolbuttons = {}   self.settings = settings.Settings(self.__class__.__name__)   self.init()     def refreshui(self):   self.ui = ui.ui()   if self.repo:   self.repo = hg.repository(self.ui, path=self.repo.root)     ### Following methods are meant to be overridden by subclasses ###     def init(self):   pass     def parse_opts(self):   pass       def get_title(self):   return ''     def get_icon(self):   return ''     def get_minsize(self):   return (395, 200)       def get_defsize(self):   return self._setting_defsize       def get_tbbuttons(self):   return []       def get_body(self):   return None       def get_extras(self):   return None       def prepare_display(self):   pass       def should_live(self, widget=None, event=None):   self._destroying(widget)   return False       def save_settings(self):   settings = {}   rect = self.get_allocation()   if self.ismaximized or self.isiconified:   settings['gdialog-rect'] = self._setting_defsize   settings['gdialog-pos'] = self._setting_winpos   else:   settings['gdialog-rect'] = (rect.width, rect.height)   settings['gdialog-pos'] = self.lastpos   settings['gdialog-ismax'] = self.ismaximized   return settings       def load_settings(self, settings):   self._setting_defsize = (678, 585)   self._setting_winpos = (0, 0)   self._setting_wasmax = False   try:   self._setting_defsize = settings['gdialog-rect']   self._setting_winpos = settings['gdialog-pos']   self._setting_wasmax = settings['gdialog-ismax']   except KeyError:   pass     ### End of overridable methods ###     def display(self, opengui=True):   self._parse_config()   self._load_settings()   if opengui:   self._setup_gtk()   self._parse_opts()   self.prepare_display()   self.show_all()   else:   self._parse_opts()   self.tooltips = gtk.Tooltips()       def test_opt(self, opt):   return self.opts.get(opt, False)     def _parse_config(self):   # defaults   self.fontcomment = 'monospace 10'   self.fontdiff = 'monospace 10'   self.fontlist = 'monospace 9'   self.diffbottom = ''     for attr, setting in self.ui.configitems('gtools'):   if setting : setattr(self, attr, setting)     if not self.diffbottom:   self.diffbottom = False   elif self.diffbottom.lower() == 'false' or self.diffbottom == '0':   self.diffbottom = False   else:   self.diffbottom = True       def _parse_opts(self):   # Remove dry_run since Hg only honors it for certain commands   self.opts['dry_run'] = False   self.opts['force_editor'] = False   self.parse_opts()       def merge_opts(self, defaults, mergelist=()):   """Merge default options with the specified local options and globals.   Results is defaults + merglist + globals   """   newopts = {}   for hgopt in defaults:   newopts[hgopt[1].replace('-', '_')] = hgopt[2]   for mergeopt in mergelist:   newopts[mergeopt] = self.opts[mergeopt]   newopts.update(self.global_opts())   return newopts       def global_opts(self):   globalopts = {}   hgglobals = [opt[1] for opt in commands.globalopts if opt[1] != 'help']   hgglobals = [f.replace('-', '_') for f in hgglobals]   for key in self.opts:   if key in hgglobals :   globalopts[key] = self.opts[key]   return globalopts       def count_revs(self):   cnt = 0   if self.test_opt('rev'):   for rev in self.opts['rev']:   cnt += len(rev.split(cmdutil.revrangesep, 1))   return cnt     - def make_toolbutton(self, stock, label, handler, - userdata=None, menu=None, tip=None, toggle=False): + def make_toolbutton(self, stock, label, handler, userdata=None, + menu=None, tip=None, toggle=False, icon=None):   if menu:   tbutton = gtk.MenuToolButton(stock)   tbutton.set_menu(menu)   elif toggle:   tbutton = gtk.ToggleToolButton(stock)   else:   tbutton = gtk.ToolButton(stock)     if tip:   tbutton.set_tooltip(self.tooltips, tip) + if icon: + path = paths.get_tortoise_icon(icon) + if path: + image = gtk.Image() + image.set_from_file(path) + tbutton.set_icon_widget(image)   tbutton.set_use_underline(True)   tbutton.set_label(label)   tbutton.connect('clicked', handler, userdata)   self.toolbuttons[label] = tbutton   return tbutton       def get_toolbutton(self, label):   return self.toolbuttons[label]     def windowstate(self, window, event):   if event.changed_mask & gtk.gdk.WINDOW_STATE_MAXIMIZED:   if event.new_window_state & gtk.gdk.WINDOW_STATE_MAXIMIZED:   self.ismaximized = True   else:   self.ismaximized = False   if event.changed_mask & gtk.gdk.WINDOW_STATE_ICONIFIED:   if event.new_window_state & gtk.gdk.WINDOW_STATE_ICONIFIED:   self.isiconified = True   else:   self.isiconified = False     def setfocus(self, window, event):   self.lastpos = self.get_position()     def _setup_gtk(self):   self.set_title(self.get_title())   gtklib.set_tortoise_icon(self, self.get_icon())   gtklib.set_tortoise_keys(self)     self.ismaximized = False   self.isiconified = False   self.lastpos = self._setting_winpos   self.connect('window-state-event', self.windowstate)   self.connect('set-focus', self.setfocus)     # Minimum size   minx, miny = self.get_minsize()   self.set_size_request(minx, miny)   # Initial size   defx, defy = self.get_defsize()   self.set_default_size(defx, defy)   if self._setting_wasmax:   self.maximize()     # Restore position if it is still on screen   screen = self.get_screen()   w, h = screen.get_width(), screen.get_height()   x, y = self._setting_winpos   if x >= 0 and x < w and y >= 0 and y < h:   self.move(x, y)     vbox = gtk.VBox(False, 0)   self.add(vbox)     self.tooltips = gtk.Tooltips()   toolbar = gtk.Toolbar()   tbuttons = self.get_tbbuttons()   for tbutton in tbuttons:   toolbar.insert(tbutton, -1)   self.toolbar = toolbar   vbox.pack_start(toolbar, False, False, 0)     # Subclass returns the main body   body = self.get_body()   vbox.pack_start(body, True, True, 0)     # Subclass provides extra stuff in bottom hbox   extras = self.get_extras()   if extras:   vbox.pack_end(extras, False, False, 0)     self.connect('destroy', self._destroying)       def _destroying(self, gtkobj):   settings = self.save_settings()   self.settings.set_value('dialogs', settings)   self.settings.write()       def _load_settings(self):   settings = self.settings.get_value('dialogs', {})   self.load_settings(settings)       def _hg_call_wrapper(self, title, command, showoutput=True):   """Run the specified command and display any resulting aborts,   messages, and errors   """   textout = ''   saved = sys.stderr   errors = cStringIO.StringIO()   try:   sys.stderr = errors   self.ui.pushbuffer()   try:   command()   except (util.Abort, IOError, OSError), inst:   Prompt(title + _(' Aborted'), str(inst), self).run()   return False, ''   finally:   sys.stderr = saved   textout = self.ui.popbuffer()   prompttext = ''   if showoutput:   prompttext = textout + '\n'   prompttext += errors.getvalue()   errors.close()   if len(prompttext) > 1:   Prompt(title + _(' Messages and Errors'),   prompttext, self).run()     return True, textout     def _do_diff(self, canonpats, options):   from hggtk import visdiff   options['canonpats'] = canonpats   dialog = visdiff.run(self.ui, **options)   if not dialog:   return   dialog.show_all()   dialog.run()   dialog.hide()     def _diff_file(self, stat, file):   self._do_diff(file and [file] or [], self.opts)     def _view_files(self, files, otherparent):   from hggtk import thgconfig   def cleanup():   shutil.rmtree(self.tmproot)     if not self.tmproot:   self.tmproot = tempfile.mkdtemp(prefix='gtools.')   atexit.register(cleanup)     def snapshot_node(ui, repo, files, node, tmproot):   '''   snapshot files as of some revision   (adapted from Extdiff extension)   '''   ctx = repo[node]   mf = ctx.manifest()   dirname = os.path.basename(repo.root)   if dirname == "":   dirname = "root"   dirname = '%s.%s' % (dirname, str(ctx))   base = os.path.join(tmproot, dirname)   try:   os.mkdir(base)   except:   pass   ui.note(_('making snapshot of %d files from rev %s\n') %   (len(files), str(ctx)))   for fn in files:   if not fn in mf:   # skipping new file after a merge ?   continue   wfn = util.pconvert(fn)   ui.note(' %s\n' % wfn)   dest = os.path.join(base, wfn)   destdir = os.path.dirname(dest)   if not os.path.isdir(destdir):   os.makedirs(destdir)   data = repo.wwritedata(wfn, repo.file(wfn).read(mf[wfn]))   open(dest, 'wb').write(data)   return dirname     def doedit():   pathroot = self.repo.root   copynode = None   # if we aren't looking at the wc, copy the node...   if otherparent:   copynode = self._node1   elif self._node2:   copynode = self._node2     if copynode:   pf = [util.pconvert(f) for f in files]   copydir = snapshot_node(self.ui, self.repo, pf,   copynode, self.tmproot)   pathroot = os.path.join(self.tmproot, copydir)     paths = ['"'+os.path.join(pathroot, f)+'"' for f in files]   command = editor + ' ' + ' '.join(paths)   util.system(command,   environ={'HGUSER': self.ui.username()},   onerr=self.ui, errprefix=_('edit failed'))     editor = (self.ui.config('tortoisehg', 'editor') or   self.ui.config('gtools', 'editor') or   os.environ.get('HGEDITOR') or   self.ui.config('ui', 'editor') or   os.environ.get('EDITOR', 'vi'))   if os.path.basename(editor) in ('vi', 'vim', 'hgeditor'):   Prompt(_('No visual editor configured'),   _('Please configure a visual editor.'), self).run()   dlg = thgconfig.ConfigDialog(False)   dlg.show_all()   dlg.focus_field('tortoisehg.editor')   dlg.run()   dlg.hide()   self.ui = ui.ui()   self._parse_config()   return     lfile = util.localpath(files[0])   thread = threading.Thread(target=doedit, name='edit:'+lfile)   thread.setDaemon(True)   thread.start()
Change 1 of 1 Show Entire File hggtk/​history.py Stacked
 
83
84
85
86
 
 
87
88
89
 
83
84
85
 
86
87
88
89
90
@@ -83,7 +83,8 @@
  _('MQ'),   self.mq_clicked,   tip=_('Toggle MQ panel'), - toggle=True) + toggle=True, + icon='menupatch.ico')   tbar += [self.mqtb, gtk.SeparatorToolItem()]   self.settingtb = self.make_toolbutton(gtk.STOCK_PREFERENCES,   _('Configure'),
icons/​menupatch.ico
Added image