This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7775

ui: refactor `readconfig()` into a form that can consume resources
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG5ac0e6f19eb4: ui: refactor `readconfig()` into a form that can consume resources
Summary

The old form can't completely go away, because files outside of packages still
need to be read. The name passed in here is a tuple of package name, resource
as needed by the resource API.

I like the idea of stating the config file is embedded in the executable by
listing is as exe!package.resource. This would be consistent with how
debuginstall points to the executable for the python executable, lib, and
installed modules. While in practice the filesystem path is available from the
backing ResourceReader when the resource is opened, it is a relative path on py2
and absolute on py3. Further, while this would show in the hg config output
for each option if set as such here, it doesn't show in the reading from...
line when --debug is used. The file isn't actually open where that prints, so
there's no way I see to get that info there. So I opted for the simple prefix
to distinguish resources from files.

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: rHG5ac0e6f19eb4: ui: refactor `readconfig()` into a form that can consume resources.Jan 8 2020, 2:51 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG5ac0e6f19eb4: ui: refactor `readconfig()` into a form that can consume resources (authored by mharbison72). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/ui.py (20 lines)

Diff 19104

mercurial/ui.py

pycompat, pycompat,
rcutil, rcutil,
scmutil, scmutil,
util, util,
) )
from .utils import ( from .utils import (
dateutil, dateutil,
procutil, procutil,
resourceutil,
stringutil, stringutil,
) )
urlreq = util.urlreq urlreq = util.urlreq
# for use with str.translate(None, _keepalnum), to keep just alphanumerics # for use with str.translate(None, _keepalnum), to keep just alphanumerics
_keepalnum = b''.join( _keepalnum = b''.join(
c for c in map(pycompat.bytechr, range(256)) if not c.isalnum() c for c in map(pycompat.bytechr, range(256)) if not c.isalnum()
_( _(
b'not trusting file %s from untrusted ' b'not trusting file %s from untrusted '
b'user %s, group %s\n' b'user %s, group %s\n'
) )
% (f, user, group) % (f, user, group)
) )
return False return False
def read_resource_config(
self, name, root=None, trust=False, sections=None, remap=None
):
try:
fp = resourceutil.open_resource(name[0], name[1])
except IOError:
if not sections: # ignore unless we were looking for something
return
raise
self._readconfig(
b'resource:%s.%s' % name, fp, root, trust, sections, remap
)
def readconfig( def readconfig(
self, filename, root=None, trust=False, sections=None, remap=None self, filename, root=None, trust=False, sections=None, remap=None
): ):
try: try:
fp = open(filename, 'rb') fp = open(filename, 'rb')
except IOError: except IOError:
if not sections: # ignore unless we were looking for something if not sections: # ignore unless we were looking for something
return return
raise raise
self._readconfig(filename, fp, root, trust, sections, remap)
def _readconfig(
self, filename, fp, root=None, trust=False, sections=None, remap=None
):
with fp: with fp:
cfg = config.config() cfg = config.config()
trusted = sections or trust or self._trusted(fp, filename) trusted = sections or trust or self._trusted(fp, filename)
try: try:
cfg.read(filename, fp, sections=sections, remap=remap) cfg.read(filename, fp, sections=sections, remap=remap)
except error.ParseError as inst: except error.ParseError as inst:
if trusted: if trusted: