On Thu, May 22, 2008 at 4:13 PM, Peter Arrenbrecht
<[EMAIL PROTECTED]> wrote:
> # HG changeset patch
> # User Peter Arrenbrecht <[EMAIL PROTECTED]>
> # Date 1211468548 -7200
> # Node ID 2544b4c12fd017b30b11073cd6d7c93ceac7d096
> # Parent 4a5ab9dd565975dd0164cb5bb7af70a8737b7c4d
> 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.
>
> diff --git a/hggtk/gdialog.py b/hggtk/gdialog.py
> --- a/hggtk/gdialog.py
> +++ b/hggtk/gdialog.py
> @@ -187,7 +187,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 :
>
Queued for 0.4. Thanks.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Tortoisehg-develop mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
