Mercurial > public > mercurial-scm > hg-stable

diff mercurial/localrepo.py @ 13360:bab5490eb2bc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bookmarks: merge _findtags method into core
author Matt Mackall <mpm@selenic.com>
date Thu, 10 Feb 2011 13:46:28 -0600
parents f26a51857dc7
children 999f616b09dc
line wrap: on
line diff
--- 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)