| hg-reviewers |
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.
| Lint Skipped |
| Unit Tests Skipped |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/rcutil.py (8 lines) | |||
| M | tests/test-config-env.py (1 line) |
| Commit | Parents | Author | Summary | Date |
|---|---|---|---|---|
| f095d64c8372 | 96af3f4ccc29 | Matt Harbison | Dec 29 2019, 9:10 PM |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | mharbison72 | ||
| Closed | mharbison72 | ||
| Closed | mharbison72 | ||
| Closed | mharbison72 | ||
| Closed | mharbison72 | ||
| Closed | mharbison72 | ||
| Closed | mharbison72 |
| 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'} | ||||
| 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 | ||||