Patchwork extdiff: expand tildes and variables in paths to user-supplied diff programs

login
register
mail settings
Submitter Jordi Gutiérrez Hermoso
Date March 3, 2015, 8:41 p.m.
Message ID <06cf9919281e13db8a2a.1425415301@Iris>
Download mbox | patch
Permalink /patch/7887/
State Accepted
Headers show

Comments

Jordi Gutiérrez Hermoso - March 3, 2015, 8:41 p.m.
# 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
Matt Mackall - March 3, 2015, 10:12 p.m.
On Tue, 2015-03-03 at 15:41 -0500, Jordi Gutiérrez Hermoso wrote:
> # 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

Queued for default, thanks.

Patch

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: