This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8793

config: remove now-unused support for "includepaths"
ClosedPublic

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

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG3f54242781e9: config: remove now-unused support for "includepaths"
Summary

This effectively undoes 081b08e4ea13 (templater: look for mapfiles in
template paths, 2015-05-15).

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 (30 lines)

Diff 22176

mercurial/config.py

encoding, encoding,
error, error,
pycompat, pycompat,
util, util,
) )
class config(object): class config(object):
def __init__(self, data=None, includepaths=None): def __init__(self, data=None):
self._data = {} self._data = {}
self._unset = [] self._unset = []
self._includepaths = includepaths or []
if data: if data:
for k in data._data: for k in data._data:
self._data[k] = data[k].copy() self._data[k] = data[k].copy()
self._source = data._source.copy() self._source = data._source.copy()
else: else:
self._source = util.cowdict() self._source = util.cowdict()
def copy(self): def copy(self):
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))
includepaths = [os.path.dirname(src)] + self._includepaths inc = os.path.normpath(
os.path.join(os.path.dirname(src), expanded)
for base in includepaths: )
inc = os.path.normpath(os.path.join(base, expanded))
try: try:
include(expanded, inc, remap=remap, sections=sections) include(expanded, inc, remap=remap, sections=sections)
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),
) )
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)
if remap: if remap:
section = remap.get(section, section) section = remap.get(section, section)