Mercurial > public > mercurial-scm > hg-stable

diff mercurial/scmwindows.py @ 22583:23c995ed466b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
config: don't read the same config file twice In some cases some config files would be read twice and shown twice in showconfig --debug.
author Mads Kiilerich <madski@unity3d.com>
date Thu, 04 Sep 2014 21:36:35 +0200
parents e3ddb4068757
children adae8928fe09
line wrap: on
line diff
--- a/mercurial/scmwindows.py	Mon Sep 29 23:23:44 2014 -0700
+++ b/mercurial/scmwindows.py	Thu Sep 04 21:36:35 2014 +0200
@@ -40,7 +40,7 @@
     path = [os.path.join(home, 'mercurial.ini'),
             os.path.join(home, '.hgrc')]
     userprofile = os.environ.get('USERPROFILE')
-    if userprofile:
+    if userprofile and userprofile != home:
         path.append(os.path.join(userprofile, 'mercurial.ini'))
         path.append(os.path.join(userprofile, '.hgrc'))
     return path