This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10392

incoming: use `urlutil.get_pull_paths`
ClosedPublic

Authored by marmoute on Apr 14 2021, 4:13 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGdec31caf5fd6: incoming: use `urlutil.get_pull_paths`
Summary

Lets use the new method to increase code reuse. However I did not implement
support for multiple source yet. It would be possible create multiple temporary
bundle, but that is a bit too much work outside of my current route to make the
detour.

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.

Event Timeline

marmoute created this revision.Apr 14 2021, 4:13 AM
marmoute updated this revision to Diff 26914.Apr 15 2021, 3:36 AM
pulkit accepted this revision.Apr 15 2021, 7:45 AM
This revision is now accepted and ready to land.Apr 15 2021, 7:45 AM
marmoute added a commit: rHGdec31caf5fd6: incoming: use `urlutil.get_pull_paths`.Apr 15 2021, 9:44 AM
Closed by commit rHGdec31caf5fd6: incoming: use `urlutil.get_pull_paths` (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (27 lines)
Mmercurial/hg.py (10 lines)

Diff 26934

mercurial/commands.py

) )
hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True) hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
return 0 return 0
cmdutil.check_incompatible_arguments(opts, b'subrepos', [b'bundle']) cmdutil.check_incompatible_arguments(opts, b'subrepos', [b'bundle'])
if opts.get(b'bookmarks'): if opts.get(b'bookmarks'):
source, branches = urlutil.parseurl( srcs = urlutil.get_pull_paths(repo, ui, [source], opts.get(b'branch'))
ui.expandpath(source), opts.get(b'branch') for source, branches in srcs:
)
other = hg.peer(repo, opts, source) other = hg.peer(repo, opts, source)
try: try:
if b'bookmarks' not in other.listkeys(b'namespaces'): if b'bookmarks' not in other.listkeys(b'namespaces'):
ui.warn(_(b"remote doesn't support bookmarks\n")) ui.warn(_(b"remote doesn't support bookmarks\n"))
return 0 return 0
ui.pager(b'incoming') ui.pager(b'incoming')
ui.status(_(b'comparing with %s\n') % urlutil.hidepassword(source)) ui.status(
_(b'comparing with %s\n') % urlutil.hidepassword(source)
)
return bookmarks.incoming(ui, repo, other) return bookmarks.incoming(ui, repo, other)
finally: finally:
other.close() other.close()
repo._subtoppath = ui.expandpath(source) repo._subtoppath = ui.expandpath(source)
try: try:
return hg.incoming(ui, repo, source, opts) return hg.incoming(ui, repo, source, opts)
finally: finally:
del repo._subtoppath del repo._subtoppath

mercurial/hg.py

displaychlist, subreporecurse, ui, repo, source, opts, buffered=False displaychlist, subreporecurse, ui, repo, source, opts, buffered=False
): ):
""" """
Helper for incoming / gincoming. Helper for incoming / gincoming.
displaychlist gets called with displaychlist gets called with
(remoterepo, incomingchangesetlist, displayer) parameters, (remoterepo, incomingchangesetlist, displayer) parameters,
and is supposed to contain only code that can't be unified. and is supposed to contain only code that can't be unified.
""" """
source, branches = urlutil.parseurl( srcs = urlutil.get_pull_paths(repo, ui, [source], opts.get(b'branch'))
ui.expandpath(source), opts.get(b'branch') srcs = list(srcs)
) if len(srcs) != 1:
msg = _('for now, incoming supports only a single source, %d provided')
msg %= len(srcs)
raise error.Abort(msg)
source, branches = srcs[0]
other = peer(repo, opts, source) other = peer(repo, opts, source)
cleanupfn = other.close cleanupfn = other.close
try: try:
ui.status(_(b'comparing with %s\n') % urlutil.hidepassword(source)) ui.status(_(b'comparing with %s\n') % urlutil.hidepassword(source))
revs, checkout = addbranchrevs(repo, other, branches, opts.get(b'rev')) revs, checkout = addbranchrevs(repo, other, branches, opts.get(b'rev'))
if revs: if revs:
revs = [other.lookup(rev) for rev in revs] revs = [other.lookup(rev) for rev in revs]