tags: do not merge bookmarks with tags

bookmarks are no tags, therefore they should not be returned as tags.

mercurial/localrepo.py

@@ -360,7 +360,6 b' class localrepository(repo.repository):'
             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)

tests/test-bookmarks-rebase.t

@@ -41,9 +41,7 b' rebase'
 
   $ hg log
   changeset:   3:9163974d1cb5
-  tag:         one
   tag:         tip
-  tag:         two
   parent:      1:925d80f479bb
   parent:      2:db815d6d32e6
   user:        test

tests/test-bookmarks.t

@@ -36,7 +36,6 b' look up bookmark'
 
   $ hg log -r X
   changeset:   0:f7b1eb17ad24
-  tag:         X
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
@@ -66,8 +65,6 b' bookmarks revset'
 
   $ hg log -r 'bookmark()'
   changeset:   1:925d80f479bb
-  tag:         X
-  tag:         X2
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
@@ -76,8 +73,6 b' bookmarks revset'
   $ hg log -r 'bookmark(Y)'
   $ hg log -r 'bookmark(X2)'
   changeset:   1:925d80f479bb
-  tag:         X
-  tag:         X2
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
@@ -166,10 +161,7 b' look up stripped bookmark name'
 
   $ hg log -r '"x  y"'
   changeset:   2:0316ce92851d
-  tag:         X2
-  tag:         Y
   tag:         tip
-  tag:         x  y
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2