This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8790

config: pass both relative and absolute paths to `include` callback
ClosedPublic

Authored by martinvonz on Jul 22 2020, 1:39 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGf7f142d74df3: config: pass both relative and absolute paths to `include` callback
Summary

The include callback is responsible for loading configs from
%include statements. The callback currently gets passed the absolute
path [1] to the config to read. That is created by joining the dirname
of the file that contains the %include statement. For PyOxidizer
support, I'm trying to reduce dependence on paths. This patch helps
with that by passing the relative path found in the %include
statement (but with username expansion, etc.) to the include
callback. It also turns out that the existing callers can easily adapt
to using the relative path. Coming patches will clean that up and then
we'll remove the absolute path from the callback.

[1] The "absolute path" bit is a bit of a lie -- it's going to be an
absolute path if the path that was passed into config.parse() was
absolute.

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.

Revision Contents
Changeset List

Diff 22075

mercurial/config.py

if m and include: if m and include:
expanded = util.expandpath(m.group(1)) expanded = util.expandpath(m.group(1))
includepaths = [os.path.dirname(src)] + self._includepaths includepaths = [os.path.dirname(src)] + self._includepaths
for base in includepaths: for base in includepaths:
inc = os.path.normpath(os.path.join(base, expanded)) inc = os.path.normpath(os.path.join(base, expanded))
try: try:
include(inc, remap=remap, sections=sections) include(expanded, inc, remap=remap, sections=sections)
break break
except IOError as inst: except IOError as inst:
if inst.errno != errno.ENOENT: if inst.errno != errno.ENOENT:
raise error.ParseError( raise error.ParseError(
_(b"cannot include %s (%s)") _(b"cannot include %s (%s)")
% (inc, encoding.strtolocal(inst.strerror)), % (inc, encoding.strtolocal(inst.strerror)),
b"%s:%d" % (src, line), b"%s:%d" % (src, line),
) )
def read(self, path, fp=None, sections=None, remap=None): def read(self, path, fp=None, sections=None, remap=None):
if not fp: if not fp:
fp = util.posixfile(path, b'rb') fp = util.posixfile(path, b'rb')
assert getattr(fp, 'mode', 'rb') == 'rb', ( assert getattr(fp, 'mode', 'rb') == 'rb', (
b'config files must be opened in binary mode, got fp=%r mode=%r' b'config files must be opened in binary mode, got fp=%r mode=%r'
% (fp, fp.mode,) % (fp, fp.mode,)
) )
def include(rel, abs, remap, sections):
self.read(abs, remap=remap, sections=sections)
self.parse( self.parse(
path, fp.read(), sections=sections, remap=remap, include=self.read path, fp.read(), sections=sections, remap=remap, include=include
) )
def parselist(value): def parselist(value):
"""parse a configuration value as a list of comma/space separated strings """parse a configuration value as a list of comma/space separated strings
>>> parselist(b'this,is "a small" ,test') >>> parselist(b'this,is "a small" ,test')
['this', 'is', 'a small', 'test'] ['this', 'is', 'a small', 'test']

mercurial/subrepoutil.py

def state(ctx, ui): def state(ctx, ui):
"""return a state dict, mapping subrepo paths configured in .hgsub """return a state dict, mapping subrepo paths configured in .hgsub
to tuple: (source from .hgsub, revision from .hgsubstate, kind to tuple: (source from .hgsub, revision from .hgsubstate, kind
(key in types dict)) (key in types dict))
""" """
p = config.config() p = config.config()
repo = ctx.repo() repo = ctx.repo()
def read(f, sections=None, remap=None): def read(rel, f, sections=None, remap=None):
if f in ctx: if f in ctx:
try: try:
data = ctx[f].data() data = ctx[f].data()
except IOError as err: except IOError as err:
if err.errno != errno.ENOENT: if err.errno != errno.ENOENT:
raise raise
# handle missing subrepo spec files as removed # handle missing subrepo spec files as removed
ui.warn( ui.warn(
_(b"warning: subrepo spec file \'%s\' not found\n") _(b"warning: subrepo spec file \'%s\' not found\n")
% repo.pathto(f) % repo.pathto(f)
) )
return return
p.parse(f, data, sections, remap, read) p.parse(f, data, sections, remap, read)
else: else:
raise error.Abort( raise error.Abort(
_(b"subrepo spec file \'%s\' not found") % repo.pathto(f) _(b"subrepo spec file \'%s\' not found") % repo.pathto(f)
) )
if b'.hgsub' in ctx: if b'.hgsub' in ctx:
read(b'.hgsub') read(b'.hgsub', b'.hgsub')
for path, src in ui.configitems(b'subpaths'): for path, src in ui.configitems(b'subpaths'):
p.set(b'subpaths', path, src, ui.configsource(b'subpaths', path)) p.set(b'subpaths', path, src, ui.configsource(b'subpaths', path))
rev = {} rev = {}
if b'.hgsubstate' in ctx: if b'.hgsubstate' in ctx:
try: try:
for i, l in enumerate(ctx[b'.hgsubstate'].data().splitlines()): for i, l in enumerate(ctx[b'.hgsubstate'].data().splitlines()):