Mercurial > hg
changeset 13385:d012d95499f7
tags: do not merge bookmarks with tags
bookmarks are no tags, therefore they should not be returned as tags.
| author | David Soria Parra <dsp@php.net> |
|---|---|
| date | Fri, 11 Feb 2011 19:44:17 +0100 |
| parents | caa561759538 |
| children | f78bc5ddbe4f |
| files | mercurial/localrepo.py tests/test-bookmarks-rebase.t tests/test-bookmarks.t |
| diffstat | 3 files changed, 0 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/localrepo.py Fri Feb 11 19:36:15 2011 +0100 +++ b/mercurial/localrepo.py Fri Feb 11 19:44:17 2011 +0100 @@ -360,7 +360,6 @@ 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)
--- a/tests/test-bookmarks-rebase.t Fri Feb 11 19:36:15 2011 +0100 +++ b/tests/test-bookmarks-rebase.t Fri Feb 11 19:44:17 2011 +0100 @@ -41,9 +41,7 @@ $ hg log changeset: 3:9163974d1cb5 - tag: one tag: tip - tag: two parent: 1:925d80f479bb parent: 2:db815d6d32e6 user: test
--- a/tests/test-bookmarks.t Fri Feb 11 19:36:15 2011 +0100 +++ b/tests/test-bookmarks.t Fri Feb 11 19:44:17 2011 +0100 @@ -36,7 +36,6 @@ $ 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 @@ $ 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 @@ $ 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 @@ $ 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