diff --git a/mercurial/discovery.py b/mercurial/discovery.py
--- a/mercurial/discovery.py
+++ b/mercurial/discovery.py
@@ -203,7 +203,11 @@
     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:
+        fremotemap = e.callcommand('branchmap', {})
+
+    remotemap = fremotemap.result()
     newbranches = branches - set(remotemap)
     branches.difference_update(newbranches)
 
@@ -287,7 +291,13 @@
     repo = pushop.repo.unfiltered()
     remote = pushop.remote
     localbookmarks = repo._bookmarks
-    remotebookmarks = remote.listkeys('bookmarks')
+
+    with remote.commandexecutor() as e:
+        fremotebookmarks = e.callcommand('listkeys', {
+            'namespace': 'bookmarks',
+        })
+
+    remotebookmarks = fremotebookmarks.result()
     bookmarkedheads = set()
 
     # internal config: bookmarks.pushing