# HG changeset patch
# User Alexis S. L. Carvalho <alexis@cecm.usp.br>
# Date 1171612383 7200
# Node ID c08b6af023bcbb3352875740f2549c239b3759e6
# Parent  403c4ddd74bbff32ce930f1c062bccb426c863fa
util_win32.py: fix user_rcpath

Fixes issue504.

diff --git a/mercurial/util.py b/mercurial/util.py
--- a/mercurial/util.py
+++ b/mercurial/util.py
@@ -801,7 +801,11 @@ if os.name == 'nt':
 
     def user_rcpath():
         '''return os-specific hgrc search path to the user dir'''
-        path = [os.path.join(os.path.expanduser('~'), 'mercurial.ini')]
+        try:
+            userrc = user_rcpath_win32()
+        except:
+            userrc = os.path.join(os.path.expanduser('~'), 'mercurial.ini')
+        path = [userrc]
         userprofile = os.environ.get('USERPROFILE')
         if userprofile:
             path.append(os.path.join(userprofile, 'mercurial.ini'))
diff --git a/mercurial/util_win32.py b/mercurial/util_win32.py
--- a/mercurial/util_win32.py
+++ b/mercurial/util_win32.py
@@ -187,7 +187,7 @@ def system_rcpath_win32():
         filename = win32api.GetModuleFileName(0)
     return [os.path.join(os.path.dirname(filename), 'mercurial.ini')]
 
-def user_rcpath():
+def user_rcpath_win32():
     '''return os-specific hgrc search path to the user dir'''
     userdir = os.path.expanduser('~')
     if userdir == '~':