# HG changeset patch # User Steve Borho # Date 2009-12-30 05:59:41 # Node ID c31ac3f7fd8f83ff728bfda18e2d0a5276f2bff8 # Parent 000546ec7ced7bda60b06fb3ad5b37209958e8d9 windows: expand environment vars in find_exe This allows us to use ${ProgramFiles} in our [merge-tools] sections so we can provide locale safe program paths. diff --git a/mercurial/windows.py b/mercurial/windows.py --- a/mercurial/windows.py +++ b/mercurial/windows.py @@ -203,7 +203,7 @@ def find_exe(command): executable = findexisting(os.path.join(path, command)) if executable is not None: return executable - return None + return findexisting(os.path.expanduser(os.path.expandvars(command))) def set_signal_handler(): try: