Mercurial > hg
changeset 13358:f26a51857dc7
bookmarks: merge invalidation into core
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Thu, 10 Feb 2011 13:46:27 -0600 |
| parents | b67867940bd1 |
| children | 87f248e78173 |
| files | hgext/bookmarks.py mercurial/localrepo.py |
| diffstat | 2 files changed, 1 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- 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):
--- 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()