facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-08 15:57:43 +03:00
Code Issues Projects Releases Wiki Activity

rcutil: unindent a block

Browse Source 
Since global _rccomponents is gone, the code could be simplified.
This commit is contained in:
Jun Wu 2017-03-28 07:55:32 -07:00
parent d209e31ef0
commit 97882c200c
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
mercurial/rcutil.py
View File

@ -76,20 +76,18 @@ def rccomponents():
'''
envrc = ('items', envrcitems())
_rccomponents = None
if _rccomponents is None:
if 'HGRCPATH' in encoding.environ:
# assume HGRCPATH is all about user configs so environments can be
# overridden.
_rccomponents = [envrc]
for p in encoding.environ['HGRCPATH'].split(pycompat.ospathsep):
if not p:
continue
_rccomponents.extend(('path', p) for p in _expandrcpath(p))
else:
paths = defaultrcpath() + systemrcpath()
_rccomponents = [('path', os.path.normpath(p)) for p in paths]
_rccomponents.append(envrc)
paths = userrcpath()
_rccomponents.extend(('path', os.path.normpath(p)) for p in paths)
if 'HGRCPATH' in encoding.environ:
# assume HGRCPATH is all about user configs so environments can be
# overridden.
_rccomponents = [envrc]
for p in encoding.environ['HGRCPATH'].split(pycompat.ospathsep):
if not p:
continue
_rccomponents.extend(('path', p) for p in _expandrcpath(p))
else:
paths = defaultrcpath() + systemrcpath()
_rccomponents = [('path', os.path.normpath(p)) for p in paths]
_rccomponents.append(envrc)
paths = userrcpath()
_rccomponents.extend(('path', os.path.normpath(p)) for p in paths)
return _rccomponents