[PATCH 5 of 6 V2] windows: eliminate system_rcpath_win32()

Adrian Buehlmann adrian at cadifra.com
Mon Feb 14 07:44:33 CST 2011


# HG changeset patch
# User Adrian Buehlmann <adrian at cadifra.com>
# Date 1297678377 -3600
# 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:


More information about the Mercurial-devel mailing list