Skip to content
Snippets Groups Projects
Commit 0d8541e53e46 authored by Pierre-Yves David's avatar Pierre-Yves David
Browse files

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

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.

Differential Revision: https://phab.mercurial-scm.org/D10430
parent afdd7c472ef2
Branches
Tags
No related merge requests found
......@@ -509,8 +509,22 @@
The `action` parameter will be used for the error message.
"""
if source is None:
source = b'default'
url = ui.expandpath(source)
if b'default' in ui.paths:
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)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment