bookmarks: merge lookup into localrepo

hgext/bookmarks.py

@@ -134,11 +134,6 b' def reposetup(ui, repo):'
         return
 
     class bookmark_repo(repo.__class__):
-        def lookup(self, key):
-            if key in self._bookmarks:
-                key = self._bookmarks[key]
-            return super(bookmark_repo, self).lookup(key)
-
         def pull(self, remote, heads=None, force=False):
             result = super(bookmark_repo, self).pull(remote, heads, force)
 

mercurial/localrepo.py

@@ -520,6 +520,8 b' class localrepository(repo.repository):'
         n = self.changelog._match(key)
         if n:
             return n
+        if key in self._bookmarks:
+            return self._bookmarks[key]
         if key in self.tags():
             return self.tags()[key]
         if key in self.branchtags():