This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8796

config: remove now-unused `abs` argument from `include` callback
ClosedPublic

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

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG668af67bfd18: config: remove now-unused `abs` argument from `include` callback

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 (9 lines)
Mmercurial/subrepoutil.py (4 lines)
Mmercurial/templater.py (2 lines)

Diff 22179

mercurial/config.py

self.set(section, item, v, b"%s:%d" % (src, line)) self.set(section, item, v, b"%s:%d" % (src, line))
continue continue
item = None item = None
cont = False cont = False
m = includere.match(l) m = includere.match(l)
if m and include: if m and include:
expanded = util.expandpath(m.group(1)) expanded = util.expandpath(m.group(1))
inc = os.path.normpath(
os.path.join(os.path.dirname(src), expanded)
)
try: try:
include(expanded, inc, remap=remap, sections=sections) include(expanded, remap=remap, sections=sections)
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)), % (expanded, encoding.strtolocal(inst.strerror)),
b"%s:%d" % (src, line), b"%s:%d" % (src, line),
) )
continue continue
if emptyre.match(l): if emptyre.match(l):
continue continue
m = sectionre.match(l) m = sectionre.match(l)
if m: if m:
section = m.group(1) section = m.group(1)
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) 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)) 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
) )

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, abs, sections=None, remap=None): def read(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', b'.hgsub') read(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()):

mercurial/templater.py

raise error.Abort( raise error.Abort(
_(b"style '%s' not found") % mapfile, _(b"style '%s' not found") % mapfile,
hint=_(b"available styles: %s") % stylelist(), hint=_(b"available styles: %s") % stylelist(),
) )
base = os.path.dirname(mapfile) base = os.path.dirname(mapfile)
conf = config.config() conf = config.config()
def include(rel, abs, remap, sections): def include(rel, remap, sections):
templatedirs = [base, templatedir()] templatedirs = [base, templatedir()]
for dir in templatedirs: for dir in templatedirs:
if dir is None: if dir is None:
continue continue
abs = os.path.normpath(os.path.join(dir, rel)) abs = os.path.normpath(os.path.join(dir, rel))
if os.path.isfile(abs): if os.path.isfile(abs):
data = util.posixfile(abs, b'rb').read() data = util.posixfile(abs, b'rb').read()
conf.parse( conf.parse(