bookmarks: merge invalidation into core

hgext/bookmarks.py

@@ -233,13 +233,6 b' def reposetup(ui, repo):'
             tags.update(self._bookmarks)
             return (tags, tagtypes)
 
-        if hasattr(repo, 'invalidate'):
-            def invalidate(self):
-                super(bookmark_repo, self).invalidate()
-                for attr in ('_bookmarks', '_bookmarkcurrent'):
-                    if attr in self.__dict__:
-                        delattr(self, attr)
-
     repo.__class__ = bookmark_repo
 
 def pull(oldpull, ui, repo, source="default", **opts):

mercurial/localrepo.py

@@ -743,7 +743,7 b' class localrepository(repo.repository):'
         self._branchcachetip = None
 
     def invalidate(self):
-        for a in ("changelog", "manifest"):
+        for a in ("changelog", "manifest", "_bookmarks", "_bookmarkscurrent"):
             if a in self.__dict__:
                 delattr(self, a)
         self.invalidatecaches()