Mercurial > hg
changeset 31682:07d62fa518a4
rcutil: rename rcpath to rccomponents (API)
| author | Jun Wu <quark@fb.com> |
|---|---|
| date | Sun, 26 Mar 2017 20:48:00 -0700 |
| parents | 294728f2a908 |
| children | 00e569a2da97 |
| files | mercurial/commands.py mercurial/rcutil.py mercurial/ui.py |
| diffstat | 3 files changed, 10 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Sun Mar 26 20:46:05 2017 -0700 +++ b/mercurial/commands.py Sun Mar 26 20:48:00 2017 -0700 @@ -1804,7 +1804,7 @@ return ui.pager('config') fm = ui.formatter('config', opts) - for f in rcutil.rcpath(): + for f in rcutil.rccomponents(): ui.debug('read config from: %s\n' % f) untrusted = bool(opts.get('untrusted')) if values:
--- a/mercurial/rcutil.py Sun Mar 26 20:46:05 2017 -0700 +++ b/mercurial/rcutil.py Sun Mar 26 20:48:00 2017 -0700 @@ -40,23 +40,23 @@ path = _expandrcpath(defaultpath) return path -_rcpath = None +_rccomponents = None -def rcpath(): +def rccomponents(): '''return hgrc search path. if env var HGRCPATH is set, use it. for each item in path, if directory, use files ending in .rc, else use item. make HGRCPATH empty to only look in .hg/hgrc of current repo. if no HGRCPATH, use default os-specific path.''' - global _rcpath - if _rcpath is None: + global _rccomponents + if _rccomponents is None: if 'HGRCPATH' in encoding.environ: - _rcpath = [] + _rccomponents = [] for p in encoding.environ['HGRCPATH'].split(pycompat.ospathsep): if not p: continue - _rcpath.extend(_expandrcpath(p)) + _rccomponents.extend(_expandrcpath(p)) else: paths = defaultrcpath() + systemrcpath() + userrcpath() - _rcpath = pycompat.maplist(os.path.normpath, paths) - return _rcpath + _rccomponents = pycompat.maplist(os.path.normpath, paths) + return _rccomponents
--- a/mercurial/ui.py Sun Mar 26 20:46:05 2017 -0700 +++ b/mercurial/ui.py Sun Mar 26 20:48:00 2017 -0700 @@ -212,7 +212,7 @@ """Create a ui and load global and user configs""" u = cls() # we always trust global config files - for f in rcutil.rcpath(): + for f in rcutil.rccomponents(): u.readconfig(f, trust=True) return u