# HG changeset patch # User Gregory Szorc # Date 1523643294 25200 # Node ID 0e50dda7e9c1bde883141a16f959d447afa03c17 # Parent 65b86ee69383a8bb7fd16d2e9f83b0cba0e87dca logexchange: use command executor for wire protocol commands Differential Revision: https://phab.mercurial-scm.org/D3290 diff -r 65b86ee69383 -r 0e50dda7e9c1 mercurial/logexchange.py --- a/mercurial/logexchange.py Fri Apr 13 11:14:19 2018 -0700 +++ b/mercurial/logexchange.py Fri Apr 13 11:14:54 2018 -0700 @@ -127,14 +127,23 @@ remoterepo is the peer instance """ remotepath = activepath(localrepo, remoterepo) - bookmarks = remoterepo.listkeys('bookmarks') + + with remoterepo.commandexecutor() as e: + bookmarks = e.callcommand('listkeys', { + 'namespace': 'bookmarks', + }).result() + # on a push, we don't want to keep obsolete heads since # they won't show up as heads on the next pull, so we # remove them here otherwise we would require the user # to issue a pull to refresh the storage bmap = {} repo = localrepo.unfiltered() - for branch, nodes in remoterepo.branchmap().iteritems(): + + with remoterepo.commandexecutor() as e: + branchmap = e.callcommand('branchmap', {}).result() + + for branch, nodes in branchmap.iteritems(): bmap[branch] = [] for node in nodes: if node in repo and not repo[node].obsolete():