[PATCH 3 of 6] tags: do not merge bookmarks with tags
David Soria Parra
dsp at php.net
Fri Feb 11 19:37:27 UTC 2011
# HG changeset patch
# User David Soria Parra <dsp at php.net>
# Date 1297449857 -3600
# Node ID eda0c1a38c277ebf3e320a1dbfda1545a565c2d6
# Parent 838d81f98a7d1ffc24955e9c7e14976c0dd6ba7d
tags: do not merge bookmarks with tags
bookmarks are no tags, therefore they should not be returned as tags.
diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -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)
diff --git a/tests/test-bookmarks-rebase.t b/tests/test-bookmarks-rebase.t
--- a/tests/test-bookmarks-rebase.t
+++ b/tests/test-bookmarks-rebase.t
@@ -41,9 +41,7 @@
$ hg log
changeset: 3:9163974d1cb5
- tag: one
tag: tip
- tag: two
parent: 1:925d80f479bb
parent: 2:db815d6d32e6
user: test
diff --git a/tests/test-bookmarks.t b/tests/test-bookmarks.t
--- a/tests/test-bookmarks.t
+++ b/tests/test-bookmarks.t
@@ -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
More information about the Mercurial-devel
mailing list