Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew
authorThomas Arendsen Hein <thomas@intevation.de>
Tue, 25 Apr 2006 19:38:45 +0200
changeset 2128 150208e0d94b
parent 2127 8a85dbbadddf (current diff)
parent 2118 e296dee1cd9a (diff)
child 2129 e5f5c21f4169
Merge with crew
--- a/mercurial/util.py	Tue Apr 25 19:38:19 2006 +0200
+++ b/mercurial/util.py	Tue Apr 25 19:38:45 2006 +0200
@@ -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	Tue Apr 25 19:38:19 2006 +0200
+++ b/mercurial/util_win32.py	Tue Apr 25 19:38:45 2006 +0200
@@ -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)
Mercurial