Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/util.py @ 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 | 9dc64c8414ca |
line wrap: on
line diff
--- 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'))