This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10410

transplant: use `get_unique_pull_path`
ClosedPublic

Authored by marmoute on Apr 14 2021, 7:37 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG0428e555acb7: transplant: use `get_unique_pull_path`
Summary

The command does not support multiple destination (yet).

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, 7:37 PM
pulkit added a subscriber: pulkit.Apr 15 2021, 11:10 AM
pulkit added inline comments.
hgext/infinitepush/__init__.py
687 ↗(On Diff #26866)

This should be a separate patch and b'' prefix is missing.

marmoute added inline comments.Apr 16 2021, 4:47 AM
hgext/infinitepush/__init__.py
687 ↗(On Diff #26866)

A yep, a stow away. Update coming

pulkit accepted this revision.Apr 17 2021, 4:48 PM
This revision is now accepted and ready to land.Apr 17 2021, 4:48 PM
marmoute added a commit: rHG0428e555acb7: transplant: use `get_unique_pull_path`.Apr 17 2021, 6:11 PM
Closed by commit rHG0428e555acb7: transplant: use `get_unique_pull_path` (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/transplant.py (4 lines)

Diff 26976

hgext/transplant.py

smartset, smartset,
state as statemod, state as statemod,
util, util,
vfs as vfsmod, vfs as vfsmod,
) )
from mercurial.utils import ( from mercurial.utils import (
procutil, procutil,
stringutil, stringutil,
urlutil,
) )
class TransplantError(error.Abort): class TransplantError(error.Abort):
pass pass
cmdtable = {} cmdtable = {}
raise error.StateError(_(b'no interrupted transplant found')) raise error.StateError(_(b'no interrupted transplant found'))
return tp.stop(ui, repo) return tp.stop(ui, repo)
else: else:
cmdutil.checkunfinished(repo) cmdutil.checkunfinished(repo)
cmdutil.bailifchanged(repo) cmdutil.bailifchanged(repo)
sourcerepo = opts.get(b'source') sourcerepo = opts.get(b'source')
if sourcerepo: if sourcerepo:
peer = hg.peer(repo, opts, ui.expandpath(sourcerepo)) u = urlutil.get_unique_pull_path(b'transplant', repo, ui, sourcerepo)[0]
peer = hg.peer(repo, opts, u)
heads = pycompat.maplist(peer.lookup, opts.get(b'branch', ())) heads = pycompat.maplist(peer.lookup, opts.get(b'branch', ()))
target = set(heads) target = set(heads)
for r in revs: for r in revs:
try: try:
target.add(peer.lookup(r)) target.add(peer.lookup(r))
except error.RepoError: except error.RepoError:
pass pass
source, csets, cleanupfn = bundlerepo.getremotechanges( source, csets, cleanupfn = bundlerepo.getremotechanges(