# HG changeset patch # User Jun Wu # Date 1490586480 25200 # Node ID 07d62fa518a4ba13a0f45b99a6d28867fbda2e33 # Parent 294728f2a908021501bf9fd69dc9f5a21e6d1680 rcutil: rename rcpath to rccomponents (API) diff -r 294728f2a908 -r 07d62fa518a4 mercurial/commands.py --- 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: diff -r 294728f2a908 -r 07d62fa518a4 mercurial/rcutil.py --- 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 diff -r 294728f2a908 -r 07d62fa518a4 mercurial/ui.py --- 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