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

cmenu: vdiff default removed from site-wide Mercurial.ini

The entire [tortoisehg] section has been removed from the site-wide
Mercurial.ini keep users from using that file to configure thg.
User can still disable visual diff by using [tortoisehg] vdiff=

Changeset 740ec4c627d1…

Parent 8800caf388a8…

by Steve Borho

Changes to 3 files · Browse files at 740ec4c627d1 Showing diff from parent 8800caf388a8 Diff from another changeset...

Change 1 of 1 Show Entire File contrib/​nautilus-thg.py Stacked
 
114
115
116
117
118
 
 
119
120
121
 
114
115
116
 
 
117
118
119
120
121
@@ -114,8 +114,8 @@
  repo = self.get_repo_for_path(path)   if repo is None:   return - diffcmd = repo.ui.config('tortoisehg', 'vdiff', None) - if diffcmd is None: + diffcmd = repo.ui.config('tortoisehg', 'vdiff', 'vdiff') + if not diffcmd:   self._run_dialog('diff', vfs_files)   else:   cmdline = ['hg', diffcmd]
Change 1 of 1 Show Entire File hggtk/​gdialog.py Stacked
 
201
202
203
204
 
205
206
207
 
201
202
203
 
204
205
206
207
@@ -201,7 +201,7 @@
    if not self.diffcmd :   # default to tortoisehg's configuration - vdiff = self.ui.config('tortoisehg', 'vdiff') + vdiff = self.ui.config('tortoisehg', 'vdiff', 'vdiff')   if vdiff:   self.diffcmd = self.ui.config('extdiff', 'cmd.'+vdiff) or vdiff   else:
Change 1 of 2 Show Entire File tortoise/​contextmenu.py Stacked
 
343
344
345
346
 
347
348
349
 
481
482
483
484
 
485
486
487
 
343
344
345
 
346
347
348
349
 
481
482
483
 
484
485
486
487
@@ -343,7 +343,7 @@
  self._shelve, icon="shelve.ico"))     # Visual Diff (any extdiff command) - has_vdiff = repo.ui.config('tortoisehg', 'vdiff', '') != '' + has_vdiff = repo.ui.config('tortoisehg', 'vdiff', 'vdiff') != ''   result.append(TortoiseMenu(_("Visual Diff"),   _("View changes using GUI diff tool"),   self._vdiff, icon="TortoiseMerge.ico", @@ -481,7 +481,7 @@
    def _vdiff(self, parent_window):   '''[tortoisehg] vdiff = <any extdiff command>''' - diff = ui.ui().config('tortoisehg', 'vdiff', None) + diff = ui.ui().config('tortoisehg', 'vdiff', 'vdiff')   if not diff:   msg = "You must configure tortoisehg.vdiff in your Mercurial.ini"   title = "Visual Diff Not Configured"