This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7777

rcutil: drop the `defaultrcpath()` method (API)
ClosedPublic

Authored by mharbison72 on Dec 30 2019, 12:43 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG2d4cad94d08a: rcutil: drop the `defaultrcpath()` method (API)
Summary

The resource based code can service py2, py3 and an oxidized executable, so
there's no reason to leave this around. It was flagged as an API change when it
was introduced, so flagging it again.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

mharbison72 created this revision.Dec 30 2019, 12:43 AM
mharbison72 added a commit: rHG2d4cad94d08a: rcutil: drop the `defaultrcpath()` method (API).Jan 8 2020, 2:51 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG2d4cad94d08a: rcutil: drop the `defaultrcpath()` method (API) (authored by mharbison72). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/rcutil.py (8 lines)
Mtests/test-config-env.py (1 line)

Diff 19106

mercurial/rcutil.py

result = [] result = []
for envname, section, configname in checklist: for envname, section, configname in checklist:
if envname not in env: if envname not in env:
continue continue
result.append((section, configname, env[envname], b'$%s' % envname)) result.append((section, configname, env[envname], b'$%s' % envname))
return result return result
def defaultrcpath():
'''return rc paths in defaultrc'''
defaultpath = os.path.join(resourceutil.datapath, b'defaultrc')
return _expandrcpath(defaultpath)
def default_rc_resources(): def default_rc_resources():
"""return rc resource IDs in defaultrc""" """return rc resource IDs in defaultrc"""
rsrcs = resourceutil.contents(b'mercurial.defaultrc') rsrcs = resourceutil.contents(b'mercurial.defaultrc')
return [ return [
(b'mercurial.defaultrc', r) (b'mercurial.defaultrc', r)
for r in sorted(rsrcs) for r in sorted(rsrcs)
if resourceutil.is_resource(b'mercurial.defaultrc', r) if resourceutil.is_resource(b'mercurial.defaultrc', r)
and r.endswith(b'.rc') and r.endswith(b'.rc')
continue continue
_rccomponents.extend((b'path', p) for p in _expandrcpath(p)) _rccomponents.extend((b'path', p) for p in _expandrcpath(p))
else: else:
_rccomponents = [(b'resource', r) for r in default_rc_resources()] _rccomponents = [(b'resource', r) for r in default_rc_resources()]
normpaths = lambda paths: [ normpaths = lambda paths: [
(b'path', os.path.normpath(p)) for p in paths (b'path', os.path.normpath(p)) for p in paths
] ]
_rccomponents.extend(normpaths(defaultrcpath() + systemrcpath())) _rccomponents.extend(normpaths(systemrcpath()))
_rccomponents.append(envrc) _rccomponents.append(envrc)
_rccomponents.extend(normpaths(userrcpath())) _rccomponents.extend(normpaths(userrcpath()))
return _rccomponents return _rccomponents
def defaultpagerenv(): def defaultpagerenv():
'''return a dict of default environment variables and their values, '''return a dict of default environment variables and their values,
intended to be set before starting a pager. intended to be set before starting a pager.
''' '''
return {b'LESS': b'FRX', b'LV': b'-c'} return {b'LESS': b'FRX', b'LV': b'-c'}

tests/test-config-env.py

def systemrcpath(): def systemrcpath():
return [join(b'sysrc')] return [join(b'sysrc')]
def userrcpath(): def userrcpath():
return [join(b'userrc')] return [join(b'userrc')]
extensions.wrapfunction(rcutil, 'defaultrcpath', lambda orig: [])
extensions.wrapfunction(rcutil, 'default_rc_resources', lambda orig: []) extensions.wrapfunction(rcutil, 'default_rc_resources', lambda orig: [])
rcutil.systemrcpath = systemrcpath rcutil.systemrcpath = systemrcpath
rcutil.userrcpath = userrcpath rcutil.userrcpath = userrcpath
# utility to print configs # utility to print configs
def printconfigs(env): def printconfigs(env):
encoding.environ = env encoding.environ = env