D3288: discovery: use command executor interface
indygreg (Gregory Szorc)
phabricator at mercurial-scm.org
Fri Apr 13 15:14:48 EDT 2018
indygreg updated this revision to Diff 8127.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3288?vs=8081&id=8127
REVISION DETAIL
https://phab.mercurial-scm.org/D3288
AFFECTED FILES
mercurial/discovery.py
CHANGE DETAILS
diff --git a/mercurial/discovery.py b/mercurial/discovery.py
--- a/mercurial/discovery.py
+++ b/mercurial/discovery.py
@@ -203,7 +203,10 @@
headssum = {}
# A. Create set of branches involved in the push.
branches = set(repo[n].branch() for n in outgoing.missing)
- remotemap = remote.branchmap()
+
+ with remote.commandexecutor() as e:
+ remotemap = e.callcommand('branchmap', {}).result()
+
newbranches = branches - set(remotemap)
branches.difference_update(newbranches)
@@ -287,7 +290,12 @@
repo = pushop.repo.unfiltered()
remote = pushop.remote
localbookmarks = repo._bookmarks
- remotebookmarks = remote.listkeys('bookmarks')
+
+ with remote.commandexecutor() as e:
+ remotebookmarks = e.callcommand('listkeys', {
+ 'namespace': 'bookmarks',
+ }).result()
+
bookmarkedheads = set()
# internal config: bookmarks.pushing
To: indygreg, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list