This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10377

urlutil: add a `get_push_paths` to perform the push destination logic
ClosedPublic

Authored by marmoute on Apr 13 2021, 8:18 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG067840864f37: urlutil: add a `get_push_paths` to perform the push destination logic
Summary

As is this changeset does not change anything. However having an official empty
point will help unifying the logic and encapsulate the details and update the
logic to support path definition pointing to multiple other path.

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/commands.py (5 lines)
Mmercurial/utils/urlutil.py (8 lines)

Diff 26894

mercurial/commands.py

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
b = repo._bookmarks.expandname(b) b = repo._bookmarks.expandname(b)
if b in repo._bookmarks: if b in repo._bookmarks:
opts.setdefault(b'rev', []).append(b) opts.setdefault(b'rev', []).append(b)
else: else:
# if we try to push a deleted bookmark, translate it to null # if we try to push a deleted bookmark, translate it to null
# this lets simultaneous -r, -b options continue working # this lets simultaneous -r, -b options continue working
opts.setdefault(b'rev', []).append(b"null") opts.setdefault(b'rev', []).append(b"null")
if not dests:
dests = [None]
some_pushed = False some_pushed = False
result = 0 result = 0
for dest in dests: for path in urlutil.get_push_paths(repo, ui, dests):
path = ui.getpath(dest, default=(b'default-push', b'default'))
if not path: if not path:
raise error.ConfigError( raise error.ConfigError(
_(b'default repository not configured!'), _(b'default repository not configured!'),
hint=_(b"see 'hg help config.paths'"), hint=_(b"see 'hg help config.paths'"),
) )
dest = path.pushloc or path.loc dest = path.pushloc or path.loc
branches = (path.branch, opts.get(b'branch') or []) branches = (path.branch, opts.get(b'branch') or [])
ui.status(_(b'pushing to %s\n') % urlutil.hidepassword(dest)) ui.status(_(b'pushing to %s\n') % urlutil.hidepassword(dest))

mercurial/utils/urlutil.py

def removeauth(u): def removeauth(u):
# type: (bytes) -> bytes # type: (bytes) -> bytes
'''remove all authentication information from a url string''' '''remove all authentication information from a url string'''
u = url(u) u = url(u)
u.user = u.passwd = None u.user = u.passwd = None
return bytes(u) return bytes(u)
def get_push_paths(repo, ui, dests):
"""yields all the `path` selected as push destination by `dests`"""
if not dests:
dests = [None]
for dest in dests:
yield ui.getpath(dest, default=(b'default-push', b'default'))
def parseurl(path, branches=None): def parseurl(path, branches=None):
'''parse url#branch, returning (url, (branch, branches))''' '''parse url#branch, returning (url, (branch, branches))'''
u = url(path) u = url(path)
branch = None branch = None
if u.fragment: if u.fragment:
branch = u.fragment branch = u.fragment
u.fragment = None u.fragment = None
return bytes(u), (branch, branches or []) return bytes(u), (branch, branches or [])