bookmarks: merge _findtags method into core

hgext/bookmarks.py

@@ -227,12 +227,6 b' def reposetup(ui, repo):'
             bookmarks.update(self, parents, node)
             return result
 
-        def _findtags(self):
-            """Merge bookmarks with normal tags"""
-            (tags, tagtypes) = super(bookmark_repo, self)._findtags()
-            tags.update(self._bookmarks)
-            return (tags, tagtypes)
-
     repo.__class__ = bookmark_repo
 
 def pull(oldpull, ui, repo, source="default", **opts):

mercurial/localrepo.py

@@ -360,6 +360,7 b' class localrepository(repo.repository):'
             if node != nullid:
                 tags[encoding.tolocal(name)] = node
         tags['tip'] = self.changelog.tip()
+        tags.update(self._bookmarks)
         tagtypes = dict([(encoding.tolocal(name), value)
                          for (name, value) in tagtypes.iteritems()])
         return (tags, tagtypes)