Mercurial > hg
changeset 10156:c31ac3f7fd8f
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.
author | Steve Borho <steve@borho.org> |
---|---|
date | Tue, 29 Dec 2009 23:59:41 -0600 |
parents | 000546ec7ced |
children | 5d92fe90be84 |
files | mercurial/windows.py |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/windows.py Mon Dec 28 16:48:57 2009 +0100 +++ b/mercurial/windows.py Tue Dec 29 23:59:41 2009 -0600 @@ -203,7 +203,7 @@ 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: