This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10379

infinitepush: use the new function to determine push destination
ClosedPublic

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

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG6071bfab6292: infinitepush: use the new function to determine push destination
Summary

Since 066b8d8f75b8, the push command accept multiple destination. infinitepush
was not aware of that. We now use the new urlutil.get_push_paths function to
determine the push destination, fixing the issue. This will also make future
evolution of that logic transparent for infinitepush

We still disallow push to multiple destinations if infinite push is enabled
because I don't know what this means for infinite push. However user will now
get a clear error message instead of a crash.

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 13 2021, 8:19 AM
pulkit accepted this revision.Apr 13 2021, 8:52 AM
This revision is now accepted and ready to land.Apr 13 2021, 8:52 AM

Revision Contents
Changeset List

PathPackages
Mhgext/infinitepush/__init__.py (18 lines)

Diff 26896

hgext/infinitepush/__init__.py

repo._bookmarks.applychanges(repo, tr, changes) repo._bookmarks.applychanges(repo, tr, changes)
def _findcommonincoming(orig, *args, **kwargs): def _findcommonincoming(orig, *args, **kwargs):
common, inc, remoteheads = orig(*args, **kwargs) common, inc, remoteheads = orig(*args, **kwargs)
return common, True, remoteheads return common, True, remoteheads
def _push(orig, ui, repo, dest=None, *args, **opts): def _push(orig, ui, repo, *dests, **opts):
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
bookmark = opts.get(b'bookmark') bookmark = opts.get(b'bookmark')
# we only support pushing one infinitepush bookmark at once # we only support pushing one infinitepush bookmark at once
if len(bookmark) == 1: if len(bookmark) == 1:
bookmark = bookmark[0] bookmark = bookmark[0]
else: else:
bookmark = b'' bookmark = b''
if scratchpush: if scratchpush:
# this is an infinitepush, we don't want the bookmark to be applied # this is an infinitepush, we don't want the bookmark to be applied
# rather that should be stored in the bundlestore # rather that should be stored in the bundlestore
opts[b'bookmark'] = [] opts[b'bookmark'] = []
ui.setconfig(experimental, configscratchpush, True) ui.setconfig(experimental, configscratchpush, True)
oldphasemove = extensions.wrapfunction( oldphasemove = extensions.wrapfunction(
exchange, b'_localphasemove', _phasemove exchange, b'_localphasemove', _phasemove
) )
# Copy-paste from `push` command
path = ui.getpath(dest, default=(b'default-push', b'default')) paths = list(urlutil.get_push_paths(repo, ui, dests))
if not path: if len(paths) > 1:
raise error.Abort( msg = _(b'cannot push to multiple path with infinitepush')
_(b'default repository not configured!'), raise error.Abort(msg)
hint=_(b"see 'hg help config.paths'"),
) path = paths[0]
destpath = path.pushloc or path.loc destpath = path.pushloc or path.loc
# Remote scratch bookmarks will be deleted because remotenames doesn't # Remote scratch bookmarks will be deleted because remotenames doesn't
# know about them. Let's save it before push and restore after # know about them. Let's save it before push and restore after
remotescratchbookmarks = _readscratchremotebookmarks(ui, repo, destpath) remotescratchbookmarks = _readscratchremotebookmarks(ui, repo, destpath)
result = orig(ui, repo, dest, *args, **pycompat.strkwargs(opts)) result = orig(ui, repo, *dests, **pycompat.strkwargs(opts))
if common.isremotebooksenabled(ui): if common.isremotebooksenabled(ui):
if bookmark and scratchpush: if bookmark and scratchpush:
other = hg.peer(repo, opts, destpath) other = hg.peer(repo, opts, destpath)
try: try:
fetchedbookmarks = other.listkeyspatterns( fetchedbookmarks = other.listkeyspatterns(
b'bookmarks', patterns=[bookmark] b'bookmarks', patterns=[bookmark]
) )
remotescratchbookmarks.update(fetchedbookmarks) remotescratchbookmarks.update(fetchedbookmarks)