This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10434

subrepo: introduce a `repo_rel_or_abs_source` function
ClosedPublic

Authored by marmoute on Apr 15 2021, 3:36 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG5a59a0ed0a37: subrepo: introduce a `repo_rel_or_abs_source` function
Summary

The subrepoutil module has various function to compute the path of a
sub-repository compared to the root of the top repository. However, they was no
function available to compute the relative path of the repository "source". And
we need this information for exchange operation (in our case, hg outgoing).
The information is currently build using the repo._subtoppath hack. We reuse
the same logic but in a dedicated function independent of the repo._subtoppath
hack.

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

Diff 26931

mercurial/subrepoutil.py

if b'.hgsubstate' in wctx and b'.hgsubstate' not in ( if b'.hgsubstate' in wctx and b'.hgsubstate' not in (
status.modified + status.added + status.removed status.modified + status.added + status.removed
): ):
status.removed.insert(0, b'.hgsubstate') status.removed.insert(0, b'.hgsubstate')
return subs, commitsubs, newstate return subs, commitsubs, newstate
def repo_rel_or_abs_source(repo):
"""return the source of this repo
Either absolute or relative the outermost repo"""
parent = repo
chunks = []
while util.safehasattr(parent, b'_subparent'):
source = urlutil.url(parent._subsource)
chunks.append(bytes(source))
if source.isabs():
break
parent = parent._subparent
chunks.reverse()
path = posixpath.join(*chunks)
return posixpath.normpath(path)
def reporelpath(repo): def reporelpath(repo):
# type: (localrepo.localrepository) -> bytes # type: (localrepo.localrepository) -> bytes
"""return path to this (sub)repo as seen from outermost repo""" """return path to this (sub)repo as seen from outermost repo"""
parent = repo parent = repo
while util.safehasattr(parent, b'_subparent'): while util.safehasattr(parent, b'_subparent'):
parent = parent._subparent parent = parent._subparent
return repo.root[len(pathutil.normasprefix(parent.root)) :] return repo.root[len(pathutil.normasprefix(parent.root)) :]