diff mercurial/repoview.py @ 18495:8260fa9f30b9 stable

bookmarks: don't use bookmarks.listbookmarks in local computations bookmarks.listbookmarks is for wire-protocol use. The normal way to get all the bookmarks on a local repository is repo._bookmarks.
author Kevin Bullock <kbullock@ringworld.org>
date Sun, 27 Jan 2013 14:24:37 -0600
parents 593eb3786165
children 3e92772d5383
line wrap: on
line diff
--- a/mercurial/repoview.py	Mon Jan 28 20:25:56 2013 -0600
+++ b/mercurial/repoview.py	Sun Jan 27 14:24:37 2013 -0600
@@ -9,7 +9,7 @@
 import copy
 import phases
 import util
-import obsolete, bookmarks, revset
+import obsolete, revset
 
 
 def hideablerevs(repo):
@@ -32,7 +32,7 @@
                       if r not in hideable]
         for par in repo[None].parents():
             blockers.append(par.rev())
-        for bm in bookmarks.listbookmarks(repo).values():
+        for bm in repo._bookmarks.values():
             blockers.append(repo[bm].rev())
         blocked = cl.ancestors(blockers, inclusive=True)
         return frozenset(r for r in hideable if r not in blocked)