Mercurial > public > mercurial-scm > hg-stable
diff mercurial/config.py @ 45281: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 | 0883413e09bc |
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)