1
# Copyright (C) 2007-2011 Canonical Ltd
1
# Copyright (C) 2007-2011, 2016 Canonical Ltd
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
63
63
out, err = self.run_bzr('tag -d branch NEWTAG')
64
64
self.assertContainsRe(err, 'Created tag NEWTAG.')
65
65
# tag should be observable through the api
66
self.assertEquals(t.branch.tags.get_tag_dict(),
66
self.assertEqual(t.branch.tags.get_tag_dict(),
67
67
dict(NEWTAG='first-revid'))
68
68
# can also create tags using -r
69
69
self.run_bzr('tag -d branch tag2 -r1')
70
self.assertEquals(t.branch.tags.lookup_tag('tag2'), 'first-revid')
70
self.assertEqual(t.branch.tags.lookup_tag('tag2'), 'first-revid')
71
71
# regression test: make sure a unicode revision from the user
72
72
# gets turned into a str object properly. The use of a unicode
73
73
# object for the revid is intentional.
74
74
self.run_bzr(['tag', '-d', 'branch', 'tag3', u'-rrevid:first-revid'])
75
self.assertEquals(t.branch.tags.lookup_tag('tag3'), 'first-revid')
75
self.assertEqual(t.branch.tags.lookup_tag('tag3'), 'first-revid')
76
76
# can also delete an existing tag
77
77
out, err = self.run_bzr('tag --delete -d branch tag2')
78
78
# cannot replace an existing tag normally
80
80
self.assertContainsRe(err, 'Tag NEWTAG already exists\\.')
81
81
# ... but can if you use --force
82
82
out, err = self.run_bzr('tag -d branch NEWTAG --force -r0')
83
self.assertEquals("Updated tag NEWTAG.\n", err)
83
self.assertEqual("Updated tag NEWTAG.\n", err)
85
85
def test_tag_same_revision(self):
86
86
t = self.make_branch_and_tree('branch')
109
109
# branching copies the tag across
110
110
self.run_bzr('branch branch1 branch2')
111
111
b2 = Branch.open('branch2')
112
self.assertEquals(b2.tags.lookup_tag('tag1'), 'first-revid')
112
self.assertEqual(b2.tags.lookup_tag('tag1'), 'first-revid')
113
113
# make a new tag and pull it
114
114
b1.tags.set_tag('tag2', 'twa')
115
115
self.run_bzr('pull -d branch2 branch1')
116
self.assertEquals(b2.tags.lookup_tag('tag2'), 'twa')
116
self.assertEqual(b2.tags.lookup_tag('tag2'), 'twa')
117
117
# make a new tag and push it
118
118
b1.tags.set_tag('tag3', 'san')
119
119
self.run_bzr('push -d branch1 branch2')
120
self.assertEquals(b2.tags.lookup_tag('tag3'), 'san')
120
self.assertEqual(b2.tags.lookup_tag('tag3'), 'san')
121
121
# make a new tag and merge it
122
122
t.commit(allow_pointless=True, message='second commit',
123
123
rev_id='second-revid')
125
125
t2.commit(allow_pointless=True, message='commit in second')
126
126
b1.tags.set_tag('tag4', 'second-revid')
127
127
self.run_bzr('merge -d branch2 branch1')
128
self.assertEquals(b2.tags.lookup_tag('tag4'), 'second-revid')
128
self.assertEqual(b2.tags.lookup_tag('tag4'), 'second-revid')
129
129
# pushing to a new location copies the tag across
130
130
self.run_bzr('push -d branch1 branch3')
131
131
b3 = Branch.open('branch3')
132
self.assertEquals(b3.tags.lookup_tag('tag1'), 'first-revid')
132
self.assertEqual(b3.tags.lookup_tag('tag1'), 'first-revid')
134
134
def make_master_and_checkout(self):
135
135
builder = self.make_branch_builder('master')
222
222
out, err = self.run_bzr('tags -d branch1',
223
223
encoding='utf-8')
224
self.assertEquals(err, '')
224
self.assertEqual(err, '')
225
225
self.assertContainsRe(out, (u'^tag1\u30d0 *2\ntag2\u30d0 *1\n' +
226
226
u'tag10\u30d0 *\\?\n').encode('utf-8'))
228
228
# lexicographical order
229
229
out, err = self.run_bzr('tags --sort=alpha -d branch1',
230
230
encoding='utf-8')
231
self.assertEquals(err, '')
231
self.assertEqual(err, '')
232
232
self.assertContainsRe(out, (u'^tag10\u30d0 *\\?\ntag1\u30d0 *2\n' +
233
233
u'tag2\u30d0 *1\n').encode('utf-8'))
235
235
out, err = self.run_bzr('tags --sort=alpha --show-ids -d branch1',
236
236
encoding='utf-8')
237
self.assertEquals(err, '')
237
self.assertEqual(err, '')
238
238
self.assertContainsRe(out, (u'^tag10\u30d0 *missing\n' +
239
239
u'tag1\u30d0 *revid-2\ntag2\u30d0 *revid-1\n').encode('utf-8'))
241
241
# chronological order
242
242
out, err = self.run_bzr('tags --sort=time -d branch1',
243
243
encoding='utf-8')
244
self.assertEquals(err, '')
244
self.assertEqual(err, '')
245
245
self.assertContainsRe(out, (u'^tag2\u30d0 *1\ntag1\u30d0 *2\n' +
246
246
u'tag10\u30d0 *\\?\n').encode('utf-8'))
248
248
out, err = self.run_bzr('tags --sort=time --show-ids -d branch1',
249
249
encoding='utf-8')
250
self.assertEquals(err, '')
250
self.assertEqual(err, '')
251
251
self.assertContainsRe(out, (u'^tag2\u30d0 *revid-1\n' +
252
252
u'tag1\u30d0 *revid-2\ntag10\u30d0 *missing\n').encode('utf-8'))
264
264
tree1.commit('merge', rev_id='revid-4')
266
266
out, err = self.run_bzr('tags -d branch1', encoding='utf-8')
267
self.assertEquals(err, '')
267
self.assertEqual(err, '')
268
268
self.assertContainsRe(out, r'tagD *2\.1\.1\n')
269
269
out, err = self.run_bzr('tags -d branch2', encoding='utf-8')
270
self.assertEquals(err, '')
270
self.assertEqual(err, '')
271
271
self.assertContainsRe(out, r'tagD *3\n')
273
273
def test_list_tags_dotted_revnos_unsupported(self):
279
279
self.overrideAttr(Branch, "revision_id_to_dotted_revno",
280
280
revision_id_to_dotted_revno)
281
281
out, err = self.run_bzr('tags -d branch', encoding='utf-8')
282
self.assertEquals(out, 'mytag ?\n')
282
self.assertEqual(out, 'mytag ?\n')
284
284
def test_list_tags_revision_filtering(self):
285
285
tree1 = self.make_branch_and_tree('.')
339
339
# sorted by number of dots
340
340
out, err = self.run_bzr('tags --sort=dots -d branch1')
341
self.assertEquals(err, '')
341
self.assertEqual(err, '')
349
349
def _check_tag_filter(self, argstr, expected_revnos):
350
350
#upper bound of laziness
351
351
out, err = self.run_bzr('tags ' + argstr)
352
self.assertEquals(err, '')
352
self.assertEqual(err, '')
353
353
self.assertContainsRe(out, "^" + ''.join(["tag %s +%s\n" % (
354
354
revno, revno) for revno in expected_revnos]) + "$")
added
removed
bzrlib/tests/blackbox/test_tags.py
