Peter Arrenbrecht avatar Peter Arrenbrecht committed 94abe45

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

Case in point:

cmd.meld =

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

Comments (0)

Files changed (1)

             # 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
                 self.diffcmd = 'diff'
                 if not self.diffopts :
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.