From patchwork Tue Mar  3 20:41:41 2015
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: extdiff: expand tildes and variables in paths to user-supplied diff
 programs
From: =?utf-8?q?Jordi_Guti=C3=A9rrez_Hermoso?= <jordigh@octave.org>
X-Patchwork-Id: 7887
Message-Id: <06cf9919281e13db8a2a.1425415301@Iris>
To: mercurial-devel@selenic.com
Date: Tue, 03 Mar 2015 15:41:41 -0500

# HG changeset patch
# User Jordi Gutiérrez Hermoso <jordigh@octave.org>
# Date 1425076507 18000
#      Fri Feb 27 17:35:07 2015 -0500
# Node ID 06cf9919281e13db8a2a11a3271ce35c5ea6ee5d
# Parent  67952dc7a88faf32211e61b8f9606f62d271eaf3
extdiff: expand tildes and variables in paths to user-supplied diff programs

diff --git a/hgext/extdiff.py b/hgext/extdiff.py
--- a/hgext/extdiff.py
+++ b/hgext/extdiff.py
@@ -276,6 +276,7 @@ def extdiff(ui, repo, *pats, **opts):
 
 def uisetup(ui):
     for cmd, path in ui.configitems('extdiff'):
+        path = util.expandpath(path)
         if cmd.startswith('cmd.'):
             cmd = cmd[4:]
             if not path: