Mercurial > hg
diff hgext/bookmarks.py @ 7480:31f70804f1b1
bookmarks: Include bookmarks in tags.
author | Martin Geisler <mg...@daimi.au.dk> |
---|---|
date | Thu, 09 Oct 2008 08:49:03 +0200 |
parents | cae586246331 |
children | 5f681a143ede |
line wrap: on
line diff
--- a/hgext/bookmarks.py Fri Dec 05 11:12:46 2008 +0100 +++ b/hgext/bookmarks.py Thu Oct 09 08:49:03 2008 +0200 @@ -219,6 +219,15 @@ write(repo, marks) return result + def tags(self): + """Merge bookmarks with normal tags""" + if self.tagscache: + return self.tagscache + + tagscache = super(bookmark_repo, self).tags() + tagscache.update(parse(repo)) + return tagscache + repo.__class__ = bookmark_repo def pushnonbookmarked(orig, ui, repo, *args, **opts):