# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1297367187 21600
# Node ID f26a51857dc755cbc9a299b65565245bacda6931
# Parent  b67867940bd1c4d6c711874cf3755650e418761d
bookmarks: merge invalidation into core

diff -r b67867940bd1 -r f26a51857dc7 hgext/bookmarks.py
--- a/hgext/bookmarks.py	Thu Feb 10 13:46:27 2011 -0600
+++ b/hgext/bookmarks.py	Thu Feb 10 13:46:27 2011 -0600
@@ -233,13 +233,6 @@
             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):
diff -r b67867940bd1 -r f26a51857dc7 mercurial/localrepo.py
--- a/mercurial/localrepo.py	Thu Feb 10 13:46:27 2011 -0600
+++ b/mercurial/localrepo.py	Thu Feb 10 13:46:27 2011 -0600
@@ -743,7 +743,7 @@
         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()