comparison mercurial/config.py @ 45254:3f54242781e9

config: remove now-unused support for "includepaths"

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

Differential Revision: https://phab.mercurial-scm.org/D8793

45251:0041a42c6f28

    util,
)


class config(object):
    def __init__(self, data=None, includepaths=None):
        self._data = {}
        self._unset = []
        self._includepaths = includepaths or []
        if data:
            for k in data._data:
                self._data[k] = data[k].copy()
            self._source = data._source.copy()
        else:

                cont = False
            m = includere.match(l)

            if m and include:
                expanded = util.expandpath(m.group(1))
                includepaths = [os.path.dirname(src)] + self._includepaths

                for base in includepaths:
                    inc = os.path.normpath(os.path.join(base, expanded))

                    try:
                        include(expanded, inc, remap=remap, sections=sections)
                        break
                    except IOError as inst:
                        if inst.errno != errno.ENOENT:
                            raise error.ParseError(
                                _(b"cannot include %s (%s)")
                                % (inc, encoding.strtolocal(inst.strerror)),
                                b"%s:%d" % (src, line),
                            )
                continue
            if emptyre.match(l):
                continue
            m = sectionre.match(l)
            if m:

45254:3f54242781e9

    util,
)


class config(object):
    def __init__(self, data=None):
        self._data = {}
        self._unset = []
        if data:
            for k in data._data:
                self._data[k] = data[k].copy()
            self._source = data._source.copy()
        else:

                cont = False
            m = includere.match(l)

            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)
                except IOError as inst:
                    if inst.errno != errno.ENOENT:
                        raise error.ParseError(
                            _(b"cannot include %s (%s)")
                            % (inc, encoding.strtolocal(inst.strerror)),
                            b"%s:%d" % (src, line),
                        )
                continue
            if emptyre.match(l):
                continue
            m = sectionre.match(l)
            if m: