# HG changeset patch
# User Vadim Gelfer <vadim.gelfer@gmail.com>
# Date 1145979495 25200
# Node ID e296dee1cd9abc6a23a61a68f5b773be88c01c8a
# Parent  760339ccc7999d231848c5a23c4e46284466f341# Parent  366e6328d10eabd5689ea19ef08c8b3a90b236e0
merge with crew.


diff -r 366e6328d10e -r e296dee1cd9a mercurial/util.py
--- a/mercurial/util.py	Sat Apr 22 09:19:27 2006 +0200
+++ b/mercurial/util.py	Tue Apr 25 08:38:15 2006 -0700
@@ -574,7 +574,10 @@
     sys.stdout = winstdout(sys.stdout)
 
     def system_rcpath():
-        return [r'c:\mercurial\mercurial.ini']
+        try:
+            return system_rcpath_win32()
+        except:
+            return [r'c:\mercurial\mercurial.ini']
 
     def os_rcpath():
         '''return default os-specific hgrc search path'''
diff -r 366e6328d10e -r e296dee1cd9a mercurial/util_win32.py
--- a/mercurial/util_win32.py	Sat Apr 22 09:19:27 2006 +0200
+++ b/mercurial/util_win32.py	Tue Apr 25 08:38:15 2006 -0700
@@ -164,7 +164,7 @@
         return details[0] != winerror.ERROR_INVALID_PARAMETER
     return True
 
-def system_rcpath():
+def system_rcpath_win32():
     '''return default os-specific hgrc search path'''
     proc = win32api.GetCurrentProcess()
     filename = win32process.GetModuleFileNameEx(proc, 0)