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

merge with stable

Changeset 85474a80cbc5…

Parents 2708217d3c3e…

Parents 740ec4c627d1…

by Steve Borho

Changes to 4 files · Browse files at 85474a80cbc5 Showing diff from parent 2708217d3c3e 740ec4c627d1 Diff from another changeset...

Change 1 of 1 Show Entire File contrib/​nautilus-thg.py Stacked
 
135
136
137
138
139
 
 
140
141
142
 
135
136
137
 
 
138
139
140
141
142
@@ -135,8 +135,8 @@
  repo = self.get_repo_for_path(cwd)     if hgcmd == 'vdiff': - diffcmd = repo.ui.config('tortoisehg', 'vdiff', None) - if diffcmd is None: + diffcmd = repo.ui.config('tortoisehg', 'vdiff', 'vdiff') + if not diffcmd:   hgcmd = 'diff'   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:
Show Entire File tortoise/​contextmenu.py Stacked
(No changes)
Change 1 of 1 Show Entire File tortoise/​menuthg.py Stacked
 
231
232
233
234
 
235
236
237
 
231
232
233
 
234
235
236
237
@@ -231,7 +231,7 @@
  'shelve', icon="shelve.ico")     # Visual Diff (any extdiff command) - has_vdiff = repo.ui.config('tortoisehg', 'vdiff', '') != '' + has_vdiff = repo.ui.config('tortoisehg', 'vdiff', 'vdiff') != ''   if has_vdiff and modified:   menu.add_menu(_("Visual Diff"),   _("View changes using GUI diff tool"),