Mercurial > public > mercurial-scm > hg
comparison mercurial/bundlerepo.py @ 37635:cc8c06835097
wireproto: convert legacy commands to command executor
Calls to the legacy commands "changegroup" and "changegroupsubset" have
been ported to the new command executor interface.
Because we always pass arguments by name and not position, some
inconsistent names throughout the code base have been unified.
As part of this change, we no longer had any remaining callers
of the legacy command methods {between, branches, changegroup,
changegroupsubset}. So, these interfaces/methods have been dropped
from peer interfaces. We still have an interface declaring these
methods. But that interface is implemented on the concrete peer
types and isn't part of the generic peer interface. (The
implementations of the command executor continue to call these
methods.)
The ultimate goal is to remove the per-command methods from the
generic peer interface: the only interface-conforming way to
call a command will be with the new executor API. At some point,
we may want to move the methods outside of the peer classes and
change the executor implementations to not call methods directly
on a peer instance.
Differential Revision: https://phab.mercurial-scm.org/D3273
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Fri, 13 Apr 2018 11:12:19 -0700 |
parents | 1541e1a8e87d |
children | d959277ff1b5 |
comparison
equal
deleted
inserted
replaced
37634:0ed11f9368fd | 37635:cc8c06835097 |
---|---|
551 else: | 551 else: |
552 if other.capable('getbundle'): | 552 if other.capable('getbundle'): |
553 cg = other.getbundle('incoming', common=common, heads=rheads) | 553 cg = other.getbundle('incoming', common=common, heads=rheads) |
554 elif onlyheads is None and not other.capable('changegroupsubset'): | 554 elif onlyheads is None and not other.capable('changegroupsubset'): |
555 # compat with older servers when pulling all remote heads | 555 # compat with older servers when pulling all remote heads |
556 cg = other.changegroup(incoming, "incoming") | 556 |
557 with other.commandexecutor() as e: | |
558 cg = e.callcommand('changegroup', { | |
559 'nodes': incoming, | |
560 'source': 'incoming', | |
561 }).result() | |
562 | |
557 rheads = None | 563 rheads = None |
558 else: | 564 else: |
559 cg = other.changegroupsubset(incoming, rheads, 'incoming') | 565 with other.commandexecutor() as e: |
566 cg = e.callcommand('changegroupsubset', { | |
567 'bases': incoming, | |
568 'heads': rheads, | |
569 'source': 'incoming', | |
570 }).result() | |
571 | |
560 if localrepo: | 572 if localrepo: |
561 bundletype = "HG10BZ" | 573 bundletype = "HG10BZ" |
562 else: | 574 else: |
563 bundletype = "HG10UN" | 575 bundletype = "HG10UN" |
564 fname = bundle = bundle2.writebundle(ui, cg, bundlename, | 576 fname = bundle = bundle2.writebundle(ui, cg, bundlename, |