# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1297367188 21600
# Node ID bab5490eb2bc5c4daf0642cf53dd061ec54384b1
# Parent  87f248e78173528fbda9e8051dba4af392b2ea0e
bookmarks: merge _findtags method into core

diff -r 87f248e78173 -r bab5490eb2bc hgext/bookmarks.py
--- a/hgext/bookmarks.py	Thu Feb 10 13:46:28 2011 -0600
+++ b/hgext/bookmarks.py	Thu Feb 10 13:46:28 2011 -0600
@@ -227,12 +227,6 @@
             bookmarks.update(self, parents, node)
             return result
 
-        def _findtags(self):
-            """Merge bookmarks with normal tags"""
-            (tags, tagtypes) = super(bookmark_repo, self)._findtags()
-            tags.update(self._bookmarks)
-            return (tags, tagtypes)
-
     repo.__class__ = bookmark_repo
 
 def pull(oldpull, ui, repo, source="default", **opts):
diff -r 87f248e78173 -r bab5490eb2bc mercurial/localrepo.py
--- a/mercurial/localrepo.py	Thu Feb 10 13:46:28 2011 -0600
+++ b/mercurial/localrepo.py	Thu Feb 10 13:46:28 2011 -0600
@@ -360,6 +360,7 @@
             if node != nullid:
                 tags[encoding.tolocal(name)] = node
         tags['tip'] = self.changelog.tip()
+        tags.update(self._bookmarks)
         tagtypes = dict([(encoding.tolocal(name), value)
                          for (name, value) in tagtypes.iteritems()])
         return (tags, tagtypes)