diff -r 4feb55e6931f -r 97eff00046de mercurial/localrepo.py
--- a/mercurial/localrepo.py	Tue Jul 17 01:04:45 2012 +0200
+++ b/mercurial/localrepo.py	Tue Jul 17 01:22:31 2012 +0200
@@ -56,10 +56,10 @@
         return self._repo.lookup(key)
 
     def branchmap(self):
-        return phases.visiblebranchmap(self._repo)
+        return discovery.visiblebranchmap(self._repo)
 
     def heads(self):
-        return phases.visibleheads(self._repo)
+        return discovery.visibleheads(self._repo)
 
     def known(self, nodes):
         return self._repo.known(nodes)