This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11674

path: keep the path instance in the `pulloperation`
ClosedPublic

Authored by marmoute on Oct 15 2021, 4:18 AM.

Details

Reviewers
pulkit
Alphare
Group Reviewers
hg-reviewers
Commits
rHG7d1e60244561: path: keep the path instance in the `pulloperation`
Summary

This will allow more pull code to use the path options. Ideally we would modify
the peer API to keep the path instance. However that is much more churn that I
can deal with for my current goal: adjusting a user facing API for a new
feature before we release it in the 6.0 changesets. So I am taking a shortcut
that seems reasonable.

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.Oct 15 2021, 4:18 AM
pulkit accepted this revision.Oct 15 2021, 8:53 AM
This revision is now accepted and ready to land.Oct 15 2021, 8:53 AM
marmoute updated this revision to Diff 30844.Oct 17 2021, 6:41 PM
Alphare accepted this revision.Oct 18 2021, 5:59 AM
marmoute added a commit: rHG7d1e60244561: path: keep the path instance in the `pulloperation`.Oct 18 2021, 7:53 AM
Closed by commit rHG7d1e60244561: path: keep the path instance in the `pulloperation` (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.
danchr added a subscriber: danchr.EditedOct 25 2021, 5:58 AM

In hg-git, we currently intercept mercurial.exchange.pull() and need to keep compatibility with both the upcoming release and earlier releases. The API change here — inserting a named argument _before_ a positional used by earlier releases — is rather obnoxious to work around. Sure, it's possible, but it won't be pretty…

Please consider moving the new argument to the end.

marmoute added a comment.Oct 29 2021, 8:19 AM
In D11674#179866, @danchr wrote:

In hg-git, we currently intercept mercurial.exchange.pull() and need to keep compatibility with both the upcoming release and earlier releases. The API change here — inserting a named argument _before_ a positional used by earlier releases — is rather obnoxious to work around. Sure, it's possible, but it won't be pretty…
Please consider moving the new argument to the end.

That seems reasonable, especially since we would hopefully merge it into the peer later.
Let me try to get a patch ready.

Revision Contents
Changeset List

PathPackages
Mhgext/convert/hg.py (2 lines)
Mmercurial/bundlerepo.py (4 lines)
Mmercurial/commands.py (1 line)
Mmercurial/exchange.py (11 lines)
Mmercurial/hg.py (2 lines)

Diff 30872

hgext/convert/hg.py

self.after() self.after()
for pbranch, heads in sorted(pycompat.iteritems(missings)): for pbranch, heads in sorted(pycompat.iteritems(missings)):
pbranchpath = os.path.join(self.path, pbranch) pbranchpath = os.path.join(self.path, pbranch)
prepo = hg.peer(self.ui, {}, pbranchpath) prepo = hg.peer(self.ui, {}, pbranchpath)
self.ui.note( self.ui.note(
_(b'pulling from %s into %s\n') % (pbranch, branch) _(b'pulling from %s into %s\n') % (pbranch, branch)
) )
exchange.pull( exchange.pull(
self.repo, prepo, [prepo.lookup(h) for h in heads] self.repo, prepo, heads=[prepo.lookup(h) for h in heads]
) )
self.before() self.before()
def _rewritetags(self, source, revmap, data): def _rewritetags(self, source, revmap, data):
fp = stringio() fp = stringio()
for line in data.splitlines(): for line in data.splitlines():
s = line.split(b' ', 1) s = line.split(b' ', 1)
if len(s) != 2: if len(s) != 2:

mercurial/bundlerepo.py

with peer.commandexecutor() as e: with peer.commandexecutor() as e:
remotephases = e.callcommand( remotephases = e.callcommand(
b'listkeys', b'listkeys',
{ {
b'namespace': b'phases', b'namespace': b'phases',
}, },
).result() ).result()
pullop = exchange.pulloperation(bundlerepo, peer, heads=reponodes) pullop = exchange.pulloperation(
bundlerepo, peer, path=None, heads=reponodes
)
pullop.trmanager = bundletransactionmanager() pullop.trmanager = bundletransactionmanager()
exchange._pullapplyphases(pullop, remotephases) exchange._pullapplyphases(pullop, remotephases)
def cleanup(): def cleanup():
if bundlerepo: if bundlerepo:
bundlerepo.close() bundlerepo.close()
if bundle: if bundle:
os.unlink(bundle) os.unlink(bundle)
peer.close() peer.close()
return (localrepo, csets, cleanup) return (localrepo, csets, cleanup)

mercurial/commands.py

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
wlock = util.nullcontextmanager() wlock = util.nullcontextmanager()
if opts.get(b'update'): if opts.get(b'update'):
wlock = repo.wlock() wlock = repo.wlock()
with wlock: with wlock:
pullopargs.update(opts.get(b'opargs', {})) pullopargs.update(opts.get(b'opargs', {}))
modheads = exchange.pull( modheads = exchange.pull(
repo, repo,
other, other,
path=path,
heads=nodes, heads=nodes,
force=opts.get(b'force'), force=opts.get(b'force'),
bookmarks=opts.get(b'bookmark', ()), bookmarks=opts.get(b'bookmark', ()),
opargs=pullopargs, opargs=pullopargs,
confirm=opts.get(b'confirm'), confirm=opts.get(b'confirm'),
).cgresult ).cgresult
# brev is a name, which might be a bookmark to be activated at # brev is a name, which might be a bookmark to be activated at

mercurial/exchange.py

A new should be created at the beginning of each pull and discarded A new should be created at the beginning of each pull and discarded
afterward. afterward.
""" """
def __init__( def __init__(
self, self,
repo, repo,
remote, remote,
path,
heads=None, heads=None,
force=False, force=False,
bookmarks=(), bookmarks=(),
remotebookmarks=None, remotebookmarks=None,
streamclonerequested=None, streamclonerequested=None,
includepats=None, includepats=None,
excludepats=None, excludepats=None,
depth=None, depth=None,
): ):
# repo we pull into # repo we pull into
self.repo = repo self.repo = repo
# repo we pull from # repo we pull from
self.remote = remote self.remote = remote
# path object used to build this remote
#
# Ideally, the remote peer would carry that directly.
self.remote_path = path
# revision we try to pull (None is "all") # revision we try to pull (None is "all")
self.heads = heads self.heads = heads
# bookmark pulled explicitly # bookmark pulled explicitly
self.explicitbookmarks = [ self.explicitbookmarks = [
repo._bookmarks.expandname(bookmark) for bookmark in bookmarks repo._bookmarks.expandname(bookmark) for bookmark in bookmarks
] ]
# do we force pull? # do we force pull?
self.force = force self.force = force
raise error.Abort(b"user aborted") raise error.Abort(b"user aborted")
tr.addvalidator(b'900-pull-prompt', prompt) tr.addvalidator(b'900-pull-prompt', prompt)
def pull( def pull(
repo, repo,
remote, remote,
path=None,
heads=None, heads=None,
force=False, force=False,
bookmarks=(), bookmarks=(),
opargs=None, opargs=None,
streamclonerequested=None, streamclonerequested=None,
includepats=None, includepats=None,
excludepats=None, excludepats=None,
depth=None, depth=None,
includepats, excludepats = repo.narrowpats includepats, excludepats = repo.narrowpats
narrowspec.validatepatterns(includepats) narrowspec.validatepatterns(includepats)
narrowspec.validatepatterns(excludepats) narrowspec.validatepatterns(excludepats)
pullop = pulloperation( pullop = pulloperation(
repo, repo,
remote, remote,
heads, path=path,
force, heads=heads,
force=force,
bookmarks=bookmarks, bookmarks=bookmarks,
streamclonerequested=streamclonerequested, streamclonerequested=streamclonerequested,
includepats=includepats, includepats=includepats,
excludepats=excludepats, excludepats=excludepats,
depth=depth, depth=depth,
**pycompat.strkwargs(opargs) **pycompat.strkwargs(opargs)
) )

mercurial/hg.py

else: else:
stream = None stream = None
# internal config: ui.quietbookmarkmove # internal config: ui.quietbookmarkmove
overrides = {(b'ui', b'quietbookmarkmove'): True} overrides = {(b'ui', b'quietbookmarkmove'): True}
with local.ui.configoverride(overrides, b'clone'): with local.ui.configoverride(overrides, b'clone'):
exchange.pull( exchange.pull(
local, local,
srcpeer, srcpeer,
revs, heads=revs,
streamclonerequested=stream, streamclonerequested=stream,
includepats=storeincludepats, includepats=storeincludepats,
excludepats=storeexcludepats, excludepats=storeexcludepats,
depth=depth, depth=depth,
) )
elif srcrepo: elif srcrepo:
# TODO lift restriction once exchange.push() accepts narrow # TODO lift restriction once exchange.push() accepts narrow
# push. # push.