Mercurial > hg

changeset 2118:e296dee1cd9a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with crew.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Tue, 25 Apr 2006 08:38:15 -0700
parents 760339ccc799 (diff) 366e6328d10e (current diff)
children 150208e0d94b
files
diffstat 2 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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'''
--- 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)