--- a/mercurial/discovery.py	Fri Apr 13 11:12:19 2018 -0700
+++ b/mercurial/discovery.py	Wed Apr 11 17:24:43 2018 -0700
@@ -209,7 +209,7 @@
 
     # A. register remote heads
     remotebranches = set()
-    for branch, heads in remote.branchmap().iteritems():
+    for branch, heads in remotemap.iteritems():
         remotebranches.add(branch)
         known = []
         unsynced = []