Mercurial > hg
changeset 2280:09ed44225571
On Windows look for mercurial.ini in $USERPROFILE, too, if available
as os.path.expanduser('~') does not always yield a useful directory.
Based on a patch from Edouard Gomez <ed.gomez@free.fr>
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Sun, 14 May 2006 18:24:32 +0200 |
| parents | 51bfa0fd3a33 |
| children | 2efa636eb411 854954fd410a |
| files | mercurial/util.py |
| diffstat | 1 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/util.py Sat May 13 23:00:46 2006 -0700 +++ b/mercurial/util.py Sun May 14 18:24:32 2006 +0200 @@ -535,8 +535,12 @@ def os_rcpath(): '''return default os-specific hgrc search path''' - return system_rcpath() + [os.path.join(os.path.expanduser('~'), - 'mercurial.ini')] + path = system_rcpath() + path.append(os.path.join(os.path.expanduser('~'), 'mercurial.ini')) + userprofile = os.environ.get('USERPROFILE') + if userprofile: + path.append(os.path.join(userprofile, 'mercurial.ini')) + return path def parse_patch_output(output_line): """parses the output produced by patch and returns the file name"""