Mercurial > hg
changeset 46963:0d8541e53e46
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
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 14 Apr 2021 21:27:00 +0200 |
| parents | afdd7c472ef2 |
| children | 221f8585e985 |
| files | mercurial/utils/urlutil.py |
| diffstat | 1 files changed, 16 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/utils/urlutil.py Wed Apr 14 21:20:58 2021 +0200 +++ b/mercurial/utils/urlutil.py Wed Apr 14 21:27:00 2021 +0200 @@ -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)