# HG changeset patch
# User Martin Geisler <mg...@daimi.au.dk>
# Date 2008-10-09 06:49:03
# Node ID 31f70804f1b188ef8b9daf3786042701b499a0b8
# Parent  cae586246331f6f0e4e976c66aeaae84b9ae1cf2

bookmarks: Include bookmarks in tags.

diff --git a/hgext/bookmarks.py b/hgext/bookmarks.py
--- a/hgext/bookmarks.py
+++ b/hgext/bookmarks.py
@@ -219,6 +219,15 @@ def reposetup(ui, repo):
                 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):