# HG changeset patch # User Yuya Nishihara # Date 2018-03-24 04:30:50 # Node ID e24802ea8dbdd5bc5ca964af59641d417d69986a # Parent 7f025c9b78655be24edf8364abfe3ff0237fb386 rcutil: directly call win32.executablepath() Since it isn't supported on POSIX platform, we don't need to double the compatibility layers. diff --git a/mercurial/posix.py b/mercurial/posix.py --- a/mercurial/posix.py +++ b/mercurial/posix.py @@ -626,9 +626,6 @@ class cachestat(object): def __ne__(self, other): return not self == other -def executablepath(): - return None # available on Windows only - def statislink(st): '''check whether a stat result is a symlink''' return st and stat.S_ISLNK(st.st_mode) diff --git a/mercurial/scmwindows.py b/mercurial/scmwindows.py --- a/mercurial/scmwindows.py +++ b/mercurial/scmwindows.py @@ -21,7 +21,7 @@ fallbackpager = 'more' def systemrcpath(): '''return default os-specific hgrc search path''' rcpath = [] - filename = util.executablepath() + filename = win32.executablepath() # Use mercurial.ini found in directory with hg.exe progrc = os.path.join(os.path.dirname(filename), 'mercurial.ini') rcpath.append(progrc) diff --git a/mercurial/util.py b/mercurial/util.py --- a/mercurial/util.py +++ b/mercurial/util.py @@ -108,7 +108,6 @@ cachestat = platform.cachestat checkexec = platform.checkexec checklink = platform.checklink copymode = platform.copymode -executablepath = platform.executablepath expandglobs = platform.expandglobs explainexit = platform.explainexit findexe = platform.findexe diff --git a/mercurial/windows.py b/mercurial/windows.py --- a/mercurial/windows.py +++ b/mercurial/windows.py @@ -31,7 +31,6 @@ except ImportError: osutil = policy.importmod(r'osutil') -executablepath = win32.executablepath getfsmountpoint = win32.getvolumename getfstype = win32.getfstype getuser = win32.getuser