Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.4rc3, 0.4rc4, and 0.4

hggtk/gdialog: handle empty cmd.differ entries in hgrc like hg does

Case in point:

[extdiff]
cmd.meld =

works in hg as `hg meld`, but failed in thg when I selected meld
as my differ.

Changeset 94abe456eaab…

Parent 037ba7eed96b…

by Peter Arrenbrecht

Changes to one file · Browse files at 94abe456eaab Showing diff from parent 037ba7eed96b Diff from another changeset...

Change 1 of 1 Show Entire File hggtk/​gdialog.py Stacked
 
188
189
190
191
 
192
193
194
 
188
189
190
 
191
192
193
194
@@ -188,7 +188,7 @@
  # default to tortoisehg's configuration   vdiff = self.ui.config('tortoisehg', 'vdiff')   if vdiff: - self.diffcmd = self.ui.config('extdiff', 'cmd.'+vdiff) + self.diffcmd = self.ui.config('extdiff', 'cmd.'+vdiff) or vdiff   else:   self.diffcmd = 'diff'   if not self.diffopts :