# HG changeset patch # User Adrian Buehlmann # Date 2011-02-14 10:12:57 # Node ID 244772f67ac1945b15a42afcf9b8ca22caa66358 # Parent 4ac565a30e84a15d3bbf9cb8a6bc42ff9a1e6da5 windows: eliminate system_rcpath_win32() diff --git a/mercurial/windows.py b/mercurial/windows.py --- a/mercurial/windows.py +++ b/mercurial/windows.py @@ -75,7 +75,7 @@ def openhardlinks(): _HKEY_LOCAL_MACHINE = 0x80000002L -def system_rcpath_win32(): +def system_rcpath(): '''return default os-specific hgrc search path''' rcpath = [] filename = executable_path() @@ -105,12 +105,6 @@ def system_rcpath_win32(): rcpath.append(os.path.join(p, f)) return rcpath -def system_rcpath(): - try: - return system_rcpath_win32() - except: - return [r'c:\mercurial\mercurial.ini'] - def user_rcpath(): '''return os-specific hgrc search path to the user dir''' try: