Mercurial > hg-stable
changeset 4098:c08b6af023bc
util_win32.py: fix user_rcpath
Fixes issue504.
| author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
|---|---|
| date | Fri, 16 Feb 2007 05:53:03 -0200 |
| parents | 403c4ddd74bb |
| children | cf5580c16b13 |
| files | mercurial/util.py mercurial/util_win32.py |
| diffstat | 2 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/util.py Thu Feb 15 09:51:57 2007 -0700 +++ b/mercurial/util.py Fri Feb 16 05:53:03 2007 -0200 @@ -801,7 +801,11 @@ 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'))
--- a/mercurial/util_win32.py Thu Feb 15 09:51:57 2007 -0700 +++ b/mercurial/util_win32.py Fri Feb 16 05:53:03 2007 -0200 @@ -187,7 +187,7 @@ 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 == '~':