bookmarks: merge invalidation into core

This commit is contained in:
Matt Mackall 2011-02-10 13:46:27 -06:00
parent 0dfef4c009
commit 89896dbd54
2 changed files with 1 additions and 8 deletions

View File

@ -233,13 +233,6 @@ 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):

View File

@ -743,7 +743,7 @@ 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()