facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-06 23:07:18 +03:00
Code Issues Projects Releases Wiki Activity

config: don't read the same config file twice

Browse Source 
In some cases some config files would be read twice and shown twice in
showconfig --debug.
This commit is contained in:
Mads Kiilerich 2014-09-04 21:36:35 +02:00
parent ddad9ef183
commit f7a8635451
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mercurial/scmposix.py
View File

@ -21,7 +21,8 @@ def systemrcpath():
# old mod_python does not set sys.argv
if len(getattr(sys, 'argv', [])) > 0:
p = os.path.dirname(os.path.dirname(sys.argv[0]))
path.extend(_rcfiles(os.path.join(p, root)))
if p != '/':
path.extend(_rcfiles(os.path.join(p, root)))
path.extend(_rcfiles('/' + root))
return path

2
mercurial/scmwindows.py
View File

@ -40,7 +40,7 @@ def userrcpath():
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