Mercurial > hg
changeset 45257:668af67bfd18
config: remove now-unused `abs` argument from `include` callback
Differential Revision: https://phab.mercurial-scm.org/D8796
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Wed, 22 Jul 2020 10:34:24 -0700 |
| parents | 83ca8d6f3206 |
| children | 46c8db8d4e03 |
| files | mercurial/config.py mercurial/subrepoutil.py mercurial/templater.py |
| diffstat | 3 files changed, 6 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/config.py Wed Jul 22 10:32:28 2020 -0700 +++ b/mercurial/config.py Wed Jul 22 10:34:24 2020 -0700 @@ -161,16 +161,13 @@ if m and include: expanded = util.expandpath(m.group(1)) - inc = os.path.normpath( - os.path.join(os.path.dirname(src), expanded) - ) try: - include(expanded, inc, remap=remap, sections=sections) + include(expanded, remap=remap, sections=sections) except IOError as inst: if inst.errno != errno.ENOENT: raise error.ParseError( _(b"cannot include %s (%s)") - % (inc, encoding.strtolocal(inst.strerror)), + % (expanded, encoding.strtolocal(inst.strerror)), b"%s:%d" % (src, line), ) continue @@ -215,7 +212,7 @@ dir = os.path.dirname(path) - def include(rel, abs, remap, sections): + def include(rel, remap, sections): abs = os.path.normpath(os.path.join(dir, rel)) self.read(abs, remap=remap, sections=sections)
--- a/mercurial/subrepoutil.py Wed Jul 22 10:32:28 2020 -0700 +++ b/mercurial/subrepoutil.py Wed Jul 22 10:34:24 2020 -0700 @@ -36,7 +36,7 @@ p = config.config() repo = ctx.repo() - def read(f, abs, sections=None, remap=None): + def read(f, sections=None, remap=None): if f in ctx: try: data = ctx[f].data() @@ -56,7 +56,7 @@ ) if b'.hgsub' in ctx: - read(b'.hgsub', b'.hgsub') + read(b'.hgsub') for path, src in ui.configitems(b'subpaths'): p.set(b'subpaths', path, src, ui.configsource(b'subpaths', path))
--- a/mercurial/templater.py Wed Jul 22 10:32:28 2020 -0700 +++ b/mercurial/templater.py Wed Jul 22 10:34:24 2020 -0700 @@ -825,7 +825,7 @@ base = os.path.dirname(mapfile) conf = config.config() - def include(rel, abs, remap, sections): + def include(rel, remap, sections): templatedirs = [base, templatedir()] for dir in templatedirs: if dir is None: