Show More
@@ -626,9 +626,6 b' class cachestat(object):' | |||||
626 | def __ne__(self, other): |
|
626 | def __ne__(self, other): | |
627 | return not self == other |
|
627 | return not self == other | |
628 |
|
628 | |||
629 | def executablepath(): |
|
|||
630 | return None # available on Windows only |
|
|||
631 |
|
||||
632 | def statislink(st): |
|
629 | def statislink(st): | |
633 | '''check whether a stat result is a symlink''' |
|
630 | '''check whether a stat result is a symlink''' | |
634 | return st and stat.S_ISLNK(st.st_mode) |
|
631 | return st and stat.S_ISLNK(st.st_mode) |
@@ -21,7 +21,7 b" fallbackpager = 'more'" | |||||
21 | def systemrcpath(): |
|
21 | def systemrcpath(): | |
22 | '''return default os-specific hgrc search path''' |
|
22 | '''return default os-specific hgrc search path''' | |
23 | rcpath = [] |
|
23 | rcpath = [] | |
24 |
filename = |
|
24 | filename = win32.executablepath() | |
25 | # Use mercurial.ini found in directory with hg.exe |
|
25 | # Use mercurial.ini found in directory with hg.exe | |
26 | progrc = os.path.join(os.path.dirname(filename), 'mercurial.ini') |
|
26 | progrc = os.path.join(os.path.dirname(filename), 'mercurial.ini') | |
27 | rcpath.append(progrc) |
|
27 | rcpath.append(progrc) |
@@ -108,7 +108,6 b' cachestat = platform.cachestat' | |||||
108 | checkexec = platform.checkexec |
|
108 | checkexec = platform.checkexec | |
109 | checklink = platform.checklink |
|
109 | checklink = platform.checklink | |
110 | copymode = platform.copymode |
|
110 | copymode = platform.copymode | |
111 | executablepath = platform.executablepath |
|
|||
112 | expandglobs = platform.expandglobs |
|
111 | expandglobs = platform.expandglobs | |
113 | explainexit = platform.explainexit |
|
112 | explainexit = platform.explainexit | |
114 | findexe = platform.findexe |
|
113 | findexe = platform.findexe |
@@ -31,7 +31,6 b' except ImportError:' | |||||
31 |
|
31 | |||
32 | osutil = policy.importmod(r'osutil') |
|
32 | osutil = policy.importmod(r'osutil') | |
33 |
|
33 | |||
34 | executablepath = win32.executablepath |
|
|||
35 | getfsmountpoint = win32.getvolumename |
|
34 | getfsmountpoint = win32.getvolumename | |
36 | getfstype = win32.getfstype |
|
35 | getfstype = win32.getfstype | |
37 | getuser = win32.getuser |
|
36 | getuser = win32.getuser |
General Comments 0
You need to be logged in to leave comments.
Login now