This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10378

urlutil: add a `get_pull_paths` to perform the pull destination logic
ClosedPublic

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

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGdf7439cc6806: urlutil: add a `get_pull_paths` to perform the pull 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 (8 lines)
Mmercurial/utils/urlutil.py (9 lines)

Diff 26895

mercurial/commands.py

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
if ui.configbool(b'commands', b'update.requiredest') and opts.get( if ui.configbool(b'commands', b'update.requiredest') and opts.get(
b'update' b'update'
): ):
msg = _(b'update destination required by configuration') msg = _(b'update destination required by configuration')
hint = _(b'use hg pull followed by hg update DEST') hint = _(b'use hg pull followed by hg update DEST')
raise error.InputError(msg, hint=hint) raise error.InputError(msg, hint=hint)
if not sources: sources = urlutil.get_pull_paths(repo, ui, sources, opts.get(b'branch'))
sources = [b'default'] for source, branches in sources:
for source in sources:
source, branches = urlutil.parseurl(
ui.expandpath(source), opts.get(b'branch')
)
ui.status(_(b'pulling from %s\n') % urlutil.hidepassword(source)) ui.status(_(b'pulling from %s\n') % urlutil.hidepassword(source))
ui.flush() ui.flush()
other = hg.peer(repo, opts, source) other = hg.peer(repo, opts, source)
update_conflict = None update_conflict = None
try: try:
revs, checkout = hg.addbranchrevs( revs, checkout = hg.addbranchrevs(
repo, other, branches, opts.get(b'rev') repo, other, branches, opts.get(b'rev')
) )

mercurial/utils/urlutil.py

def get_push_paths(repo, ui, dests): def get_push_paths(repo, ui, dests):
"""yields all the `path` selected as push destination by `dests`""" """yields all the `path` selected as push destination by `dests`"""
if not dests: if not dests:
dests = [None] dests = [None]
for dest in dests: for dest in dests:
yield ui.getpath(dest, default=(b'default-push', b'default')) yield ui.getpath(dest, default=(b'default-push', b'default'))
def get_pull_paths(repo, ui, sources, default_branches=()):
"""yields all the `(path, branch)` selected as pull source by `sources`"""
if not sources:
sources = [b'default']
for source in sources:
url = ui.expandpath(source)
yield parseurl(url, default_branches)
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 [])