Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.7.3, 0.7.4, and 0.7.5

gdialog: support full extdiff settings

Borrow extdiff's code for parsing [extdiff] section to properly
load vdiff options from the user's Mercurial.ini file.

Fixes #125 and probably #126

Changeset 523b97d77588…

Parent 85be6017f60d…

by Steve Borho

Changes to one file · Browse files at 523b97d77588 Showing diff from parent 85be6017f60d Diff from another changeset...

Change 1 of 4 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
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
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
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
 # gdialog.py - base dialog for gtools  #  # Copyright 2007 Brad Schick, brad at gmail . com  #  # This software may be used and distributed according to the terms  # of the GNU General Public License, incorporated herein by reference.  #    import mercurial.demandimport; mercurial.demandimport.disable()    import os  import threading  import StringIO  import sys  import shutil  import tempfile  import datetime  import cPickle    import pygtk  pygtk.require('2.0')  import gtk  import gobject  import pango +import shlex    from mercurial.i18n import _  from mercurial.node import short  from mercurial import cmdutil, util, ui, hg, commands  from hgext import extdiff  from shlib import shell_notify, set_tortoise_icon, Settings  from thgconfig import ConfigDialog  from gtklib import MessageDialog  from hglib import toutf      class SimpleMessage(MessageDialog):   def run(self):   response = 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(toutf(title))   self.set_markup('<b>' + toutf(message) + '</b>')    class Confirm(SimpleMessage):   """Dialog returns gtk.RESPONSE_YES or gtk.RESPONSE_NO   """   def __init__(self, title, files, parent, primary=None):   SimpleMessage.__init__(self, parent, gtk.DIALOG_MODAL,   gtk.MESSAGE_QUESTION, gtk.BUTTONS_YES_NO)   self.set_title(toutf('Confirm ' + title))   if primary is None:   primary = title + ' file' + ((len(files) > 1 and 's') or '') + '?'   primary = '<b>' + primary + '</b>'   self.set_markup(toutf(primary))   message = ''   for i, f in enumerate(files):   message += ' ' + f + '\n'   if i == 9:   message += ' ...\n'   break   self.format_secondary_text(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"   settings_version = 1     def __init__(self, ui, repo, cwd, pats, opts, main):   gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)   self.cwd = cwd   self.ui = ui   self.ui.interactive=False   self.repo = repo   self.pats = pats   self.opts = opts   self.main = main   self.tmproot = None   self.toolbuttons = {}   self.settings = Settings(self.__class__.__name__)   self.init()     ### 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):   if self.main:   self._destroying(widget)   else:   self.destroy()   return False       def save_settings(self):   rect = self.get_allocation()   return {'gdialog': (rect.width, rect.height)}       def load_settings(self, settings):   if settings:   self._setting_defsize = settings['gdialog']   else:   self._setting_defsize = (678, 585)     ### 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 opt in self.opts and self.opts[opt]   + def _parse_extdiff_cmd(self, usercmd): + for cmd, path in self.ui.configitems('extdiff'): + if cmd.startswith('cmd.'): + cmd = cmd[4:] + if cmd != usercmd: + continue + if not path: + path = cmd + diffopts = self.ui.config('extdiff', 'opts.' + cmd, '') + diffopts = diffopts and [diffopts] or [] + elif cmd == usercmd: + # command = path opts + if path: + diffopts = shlex.split(path) + path = diffopts.pop(0) + else: + path, diffopts = cmd, [] + return path, diffopts + return None, None     def _parse_config(self):   # defaults   self.fontcomment = 'monospace 10'   self.fontdiff = 'monospace 10'   self.fontlist = 'monospace 9' - self.diffopts = '' + self.diffopts = []   self.diffcmd = ''   self.diffbottom = ''     for attr, setting in self.ui.configitems('gtools'):   if setting : setattr(self, attr, setting)     if not self.diffcmd :   # default to tortoisehg's configuration   vdiff = self.ui.config('tortoisehg', 'vdiff', 'vdiff')   if vdiff: - self.diffcmd = self.ui.config('extdiff', 'cmd.'+vdiff) or vdiff + self.diffcmd, self.diffopts = self._parse_extdiff_cmd(vdiff)   else:   self.diffcmd = 'diff' - if not self.diffopts : - self.diffopts = '-Npru' + if not self.diffopts: + self.diffopts = ['-Npru']     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].replace('-', '_') for opt in commands.globalopts if opt[1] != 'help']   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):   if menu:   tbutton = gtk.MenuToolButton(stock)   tbutton.set_menu(menu)   else:   tbutton = gtk.ToolButton(stock)     if tip:   tbutton.set_tooltip(self.tooltips, tip)   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 _setup_gtk(self):   self.set_title(self.get_title())   set_tortoise_icon(self, self.get_icon())     # 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)     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)   self.connect('delete_event', self.should_live)       def _destroying(self, gtkobj):   try:   settings = self.save_settings()   self.settings.set_value('settings_version', GDialog.settings_version)   self.settings.set_value('dialogs', settings)   self.settings.write()   finally:   if self.main:   gtk.main_quit()       def _load_settings(self):   settings = {}   version = self.settings.get_value('settings_version', None)   if version == GDialog.settings_version:   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 = StringIO.StringIO()   try:   sys.stderr = errors   self.ui.pushbuffer()   try:   command()   except util.Abort, 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 _diff_file(self, stat, file):   def dodiff(): - extdiff.dodiff(self.ui, self.repo, self.diffcmd, [self.diffopts], + extdiff.dodiff(self.ui, self.repo, self.diffcmd, self.diffopts,   [self.repo.wjoin(file)], self.opts)     if self.diffcmd == 'diff':   Prompt('No visual diff configured',   'Please select a visual diff application.', self).run()   dlg = ConfigDialog(self.repo.root, False)   dlg.show_all()   dlg.focus_field('tortoisehg.vdiff')   dlg.run()   dlg.hide()   self.ui = ui.ui()   self._parse_config()   return   thread = threading.Thread(target=dodiff, name='diff:'+file)   thread.setDaemon(True)   thread.start()       def _view_file(self, stat, file, force_left=False):   import atexit     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)   '''   mf = repo.changectx(node).manifest()   dirname = os.path.basename(repo.root)   if dirname == "":   dirname = "root"   dirname = '%s.%s' % (dirname, short(node))   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), short(node)))   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 stat in 'R!' or force_left:   copynode = self._node1   elif self._node2:   copynode = self._node2     if copynode:   copydir = snapshot_node(self.ui, self.repo,   [util.pconvert(file)], copynode, self.tmproot)   pathroot = os.path.join(self.tmproot, copydir)     file_path = os.path.join(pathroot, file)   util.system("%s \"%s\"" % (editor, file_path),   environ={'HGUSER': self.ui.username()},   onerr=util.Abort, 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 = ConfigDialog(self.repo.root, False)   dlg.show_all()   dlg.focus_field('tortoisehg.editor')   dlg.run()   dlg.hide()   self.ui = ui.ui()   self._parse_config()   return     file = util.localpath(file)   thread = threading.Thread(target=doedit, name='edit:'+file)   thread.setDaemon(True)   thread.start()    class NativeSaveFileDialogWrapper:   """Wrap the windows file dialog, or display default gtk dialog if that isn't available"""   def __init__(self, InitialDir = None, Title = "Save File",   Filter = {"All files": "*.*"}, FilterIndex = 1, FileName = ''):   import os.path   if InitialDir == None:   InitialDir = os.path.expanduser("~")   self.InitialDir = InitialDir   self.FileName = FileName   self.Title = Title   self.Filter = Filter   self.FilterIndex = FilterIndex     def run(self):   """run the file dialog, either return a file name, or False if the user aborted the dialog"""   try:   import win32gui   if self.tortoiseHgIsInstalled(): #as of 20071021, the file dialog will hang if the tortoiseHg shell extension is installed. I have no clue why, yet - Tyberius Prime   return self.runCompatible()   else:   return self.runWindows()   except ImportError:   return self.runCompatible()     def tortoiseHgIsInstalled(self):   import _winreg   try:   _winreg.OpenKey(_winreg.HKEY_LOCAL_MACHINE,   r"Software\TortoiseHg")   return True   except WindowsError: #reg key not found   pass   return False     def runWindows(self):   import win32gui, win32con   #filter = ""   #for name, pattern in self.Filter.iteritems():   # filter += name + "\0" + pattern + "\0"   #customfilter = "\0"     fname, customfilter, flags=win32gui.GetSaveFileNameW(   InitialDir=self.InitialDir,   Flags=win32con.OFN_EXPLORER,   File=self.FileName,   DefExt='py',   Title=self.Title,   Filter="",   CustomFilter="",   FilterIndex=1)   if fname:   return fname   else:   return False     def runCompatible(self):   file_save =gtk.FileChooserDialog(self.Title,None,   gtk.FILE_CHOOSER_ACTION_SAVE   , (gtk.STOCK_CANCEL   , gtk.RESPONSE_CANCEL   , gtk.STOCK_SAVE   , gtk.RESPONSE_OK))   file_save.set_do_overwrite_confirmation(True)   file_save.set_default_response(gtk.RESPONSE_OK)   file_save.set_current_folder(self.InitialDir)   file_save.set_current_name(self.FileName)   for name, pattern in self.Filter.iteritems():   fi = gtk.FileFilter()   fi.set_name(name)   fi.add_pattern(pattern)   file_save.add_filter(fi)   if file_save.run() == gtk.RESPONSE_OK:   result = file_save.get_filename();   else:   result = False   file_save.destroy()   return result