diff -r 442c0cb8287a -r a60963c02f92 mercurial/bookmarks.py
--- a/mercurial/bookmarks.py	Fri Mar 29 19:52:02 2013 -0700
+++ b/mercurial/bookmarks.py	Fri Mar 29 19:54:06 2013 -0700
@@ -221,9 +221,8 @@
     finally:
         w.release()
 
-def updatefromremote(ui, repo, remote, path):
+def updatefromremote(ui, repo, remotemarks, path):
     ui.debug("checking for updated bookmarks\n")
-    remotemarks = remote.listkeys('bookmarks')
     changed = False
     localmarks = repo._bookmarks
     for k in sorted(remotemarks):