This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10430

urlutil: remove usage of `ui.expandpath` in `get_unique_pull_path`
ClosedPublic

Authored by marmoute on Apr 14 2021, 7:39 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG0d8541e53e46: urlutil: remove usage of `ui.expandpath` in `get_unique_pull_path`
Summary

We want to deprecate ui.expandpath and simplify the code before adding more
complexity in the form of [paths] entry pointing to multiple url. So we inline
the relevant bits.

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/utils/urlutil.py (18 lines)

Diff 26995

mercurial/utils/urlutil.py

This is useful for command and action that does not support multiple This is useful for command and action that does not support multiple
destination (yet). destination (yet).
Note that for now, we cannot get multiple destination so this function is "trivial". Note that for now, we cannot get multiple destination so this function is "trivial".
The `action` parameter will be used for the error message. The `action` parameter will be used for the error message.
""" """
if source is None: if source is None:
source = b'default' if b'default' in ui.paths:
url = ui.expandpath(source) url = ui.paths[b'default'].rawloc
else:
# XXX this is the historical default behavior, but that is not
# great, consider breaking BC on this.
url = b'default'
else:
if source in ui.paths:
url = ui.paths[source].rawloc
else:
# Try to resolve as a local path or URI.
try:
# we pass the ui instance are warning might need to be issued
url = path(ui, None, rawloc=source).rawloc
except ValueError:
url = source
return parseurl(url, default_branches) return parseurl(url, default_branches)
def get_clone_path(ui, source, default_branches=()): def get_clone_path(ui, source, default_branches=()):
"""return the `(origsource, path, branch)` selected as clone source""" """return the `(origsource, path, branch)` selected as clone source"""
url = ui.expandpath(source) url = ui.expandpath(source)
path, branch = parseurl(url, default_branches) path, branch = parseurl(url, default_branches)
return url, path, branch return url, path, branch