This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8794

subrepoutil: use relative path for looking up config `%include`s
ClosedPublic

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

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG0323972f78f3: subrepoutil: use relative path for looking up config `%include`s
Summary

The code was already working with relative paths in practice, since it
passed in a (repo-)relative path into its local read() function. So
all that this patch actually does is to switch to rename variables so
we use the same path by a different name. This gets us closer to
removing the "absolute" path from the 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/subrepoutil.py (2 lines)

Diff 22177

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(rel, f, sections=None, remap=None): def read(f, abs, 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(