This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8795

config: re-calculate absolute %include path in `include` callback
ClosedPublic

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

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG83ca8d6f3206: config: re-calculate absolute %include path in `include` callback
Summary

This removes the last user of the abs argument for the include
callback. The next patch will remove the argument.

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

PathPackages
Mmercurial/config.py (3 lines)

Diff 22178

mercurial/config.py

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,)
) )
dir = os.path.dirname(path)
def include(rel, abs, remap, sections): def include(rel, abs, remap, sections):
abs = os.path.normpath(os.path.join(dir, rel))
self.read(abs, remap=remap, sections=sections) self.read(abs, remap=remap, sections=sections)
self.parse( self.parse(
path, fp.read(), sections=sections, remap=remap, include=include path, fp.read(), sections=sections, remap=remap, include=include
) )
def parselist(value): def parselist(value):