17
17
"""Tests for commands related to tags"""
19
19
from bzrlib import (
23
24
from bzrlib.branch import (
26
from bzrlib.bzrdir import BzrDir
27
from bzrlib.tests import TestCaseWithTransport
28
from bzrlib.repository import (
27
from bzrlib.tests import (
29
TestCaseWithTransport,
31
from bzrlib.tests.matchers import ContainsNoVfsCalls
31
32
from bzrlib.workingtree import WorkingTree
34
35
class TestTagging(TestCaseWithTransport):
36
# as of 0.14, the default format doesn't do tags so we need to use a
39
def make_branch_and_tree(self, relpath):
40
format = bzrdir.format_registry.make_bzrdir('dirstate-with-subtree')
41
return TestCaseWithTransport.make_branch_and_tree(self, relpath,
44
37
def test_tag_command_help(self):
45
38
out, err = self.run_bzr('help tag')
46
39
self.assertContainsRe(out, 'Create, remove or modify a tag')
68
61
rev_id='first-revid')
69
62
# make a tag through the command line
70
63
out, err = self.run_bzr('tag -d branch NEWTAG')
71
self.assertContainsRe(out, 'Created tag NEWTAG.')
64
self.assertContainsRe(err, 'Created tag NEWTAG.')
72
65
# tag should be observable through the api
73
self.assertEquals(t.branch.tags.get_tag_dict(),
66
self.assertEqual(t.branch.tags.get_tag_dict(),
74
67
dict(NEWTAG='first-revid'))
75
68
# can also create tags using -r
76
69
self.run_bzr('tag -d branch tag2 -r1')
77
self.assertEquals(t.branch.tags.lookup_tag('tag2'), 'first-revid')
70
self.assertEqual(t.branch.tags.lookup_tag('tag2'), 'first-revid')
78
71
# regression test: make sure a unicode revision from the user
79
72
# gets turned into a str object properly. The use of a unicode
80
73
# object for the revid is intentional.
81
74
self.run_bzr(['tag', '-d', 'branch', 'tag3', u'-rrevid:first-revid'])
82
self.assertEquals(t.branch.tags.lookup_tag('tag3'), 'first-revid')
75
self.assertEqual(t.branch.tags.lookup_tag('tag3'), 'first-revid')
83
76
# can also delete an existing tag
84
77
out, err = self.run_bzr('tag --delete -d branch tag2')
85
78
# cannot replace an existing tag normally
86
out, err = self.run_bzr('tag -d branch NEWTAG', retcode=3)
79
out, err = self.run_bzr('tag -d branch NEWTAG -r0', retcode=3)
87
80
self.assertContainsRe(err, 'Tag NEWTAG already exists\\.')
88
81
# ... but can if you use --force
89
out, err = self.run_bzr('tag -d branch NEWTAG --force')
82
out, err = self.run_bzr('tag -d branch NEWTAG --force -r0')
83
self.assertEqual("Updated tag NEWTAG.\n", err)
85
def test_tag_same_revision(self):
86
t = self.make_branch_and_tree('branch')
87
t.commit(allow_pointless=True, message='initial commit',
89
t.commit(allow_pointless=True, message='second commit',
90
rev_id='second-revid')
91
out, err = self.run_bzr('tag -rrevid:first-revid -d branch NEWTAG')
92
out, err = self.run_bzr('tag -rrevid:first-revid -d branch NEWTAG')
93
self.assertContainsRe(err,
94
'Tag NEWTAG already exists for that revision\\.')
95
out, err = self.run_bzr('tag -rrevid:second-revid -d branch NEWTAG',
97
self.assertContainsRe(err, 'Tag NEWTAG already exists\\.')
91
99
def test_tag_delete_requires_name(self):
92
100
out, err = self.run_bzr('tag -d branch', retcode=3)
101
109
# branching copies the tag across
102
110
self.run_bzr('branch branch1 branch2')
103
111
b2 = Branch.open('branch2')
104
self.assertEquals(b2.tags.lookup_tag('tag1'), 'first-revid')
112
self.assertEqual(b2.tags.lookup_tag('tag1'), 'first-revid')
105
113
# make a new tag and pull it
106
114
b1.tags.set_tag('tag2', 'twa')
107
115
self.run_bzr('pull -d branch2 branch1')
108
self.assertEquals(b2.tags.lookup_tag('tag2'), 'twa')
116
self.assertEqual(b2.tags.lookup_tag('tag2'), 'twa')
109
117
# make a new tag and push it
110
118
b1.tags.set_tag('tag3', 'san')
111
119
self.run_bzr('push -d branch1 branch2')
112
self.assertEquals(b2.tags.lookup_tag('tag3'), 'san')
120
self.assertEqual(b2.tags.lookup_tag('tag3'), 'san')
113
121
# make a new tag and merge it
114
122
t.commit(allow_pointless=True, message='second commit',
115
123
rev_id='second-revid')
117
125
t2.commit(allow_pointless=True, message='commit in second')
118
126
b1.tags.set_tag('tag4', 'second-revid')
119
127
self.run_bzr('merge -d branch2 branch1')
120
self.assertEquals(b2.tags.lookup_tag('tag4'), 'second-revid')
128
self.assertEqual(b2.tags.lookup_tag('tag4'), 'second-revid')
121
129
# pushing to a new location copies the tag across
122
130
self.run_bzr('push -d branch1 branch3')
123
131
b3 = Branch.open('branch3')
124
self.assertEquals(b3.tags.lookup_tag('tag1'), 'first-revid')
132
self.assertEqual(b3.tags.lookup_tag('tag1'), 'first-revid')
134
def make_master_and_checkout(self):
135
builder = self.make_branch_builder('master')
136
builder.build_commit(message='Initial commit.', rev_id='rev-1')
137
master = builder.get_branch()
138
child = master.create_checkout(self.get_url('child'))
141
def make_fork(self, branch):
142
fork = branch.create_clone_on_transport(self.get_transport('fork'))
143
self.addCleanup(fork.lock_write().unlock)
144
with transform.TransformPreview(fork.basis_tree()) as tt:
145
tt.commit(fork, message='Commit in fork.', revision_id='fork-0')
146
with transform.TransformPreview(fork.basis_tree()) as tt:
147
tt.commit(fork, message='Commit in fork.', revision_id='fork-1')
150
def test_merge_without_commit_does_not_propagate_tags_to_master(self):
151
"""'bzr merge' alone does not propagate tags to a master branch.
153
(If the user runs 'bzr commit', then that is when the tags from the
154
merge are propagated.)
156
master, child = self.make_master_and_checkout()
157
fork = self.make_fork(master)
158
fork.tags.set_tag('new-tag', fork.last_revision())
159
self.run_bzr(['merge', '../fork'], working_dir='child')
160
self.assertEqual({}, master.tags.get_tag_dict())
162
def test_commit_in_heavyweight_checkout_copies_tags_to_master(self):
163
master, child = self.make_master_and_checkout()
164
fork = self.make_fork(master)
165
fork.tags.set_tag('new-tag', fork.last_revision())
166
fork.tags.set_tag('non-ancestry-tag', 'fork-0')
167
fork.tags.set_tag('absent-tag', 'absent-rev')
168
script.run_script(self, """
171
$ bzr commit -m "Merge fork."
172
2>Committing to: .../master/
173
2>Committed revision 2.
174
""", null_output_matches_anything=True)
175
# Merge copied the tag to child and commit propagated it to master
176
expected_tag_dict = {
177
'new-tag': fork.last_revision(),
178
'non-ancestry-tag': 'fork-0',
179
'absent-tag': 'absent-rev',
181
self.assertEqual(expected_tag_dict, child.branch.tags.get_tag_dict())
182
self.assertEqual(expected_tag_dict, master.tags.get_tag_dict())
183
# Revisions not in ancestry but named in tags are present
184
child.branch.repository.get_revision('fork-0')
185
master.repository.get_revision('fork-0')
187
def test_commit_in_heavyweight_checkout_reports_tag_conflict(self):
188
master, child = self.make_master_and_checkout()
189
fork = self.make_fork(master)
190
fork.tags.set_tag('new-tag', fork.last_revision())
191
master_r1 = master.last_revision()
192
master.tags.set_tag('new-tag', master_r1)
193
script.run_script(self, """
196
$ bzr commit -m "Merge fork."
197
2>Committing to: .../master/
198
2>Conflicting tags in bound branch:
200
2>Committed revision 2.
201
""", null_output_matches_anything=True)
202
# Merge copied the tag to child. master's conflicting tag is unchanged.
204
{'new-tag': fork.last_revision()}, child.branch.tags.get_tag_dict())
206
{'new-tag': master_r1}, master.tags.get_tag_dict())
126
208
def test_list_tags(self):
127
209
tree1 = self.make_branch_and_tree('branch1')
133
215
b1 = tree1.branch
134
216
# note how the tag for revid-1 sorts after the one for revid-2
135
b1.tags.set_tag(u'tagA\u30d0', 'revid-2')
136
b1.tags.set_tag(u'tagB\u30d0', 'missing') # not present in repository
137
b1.tags.set_tag(u'tagC\u30d0', 'revid-1')
217
b1.tags.set_tag(u'tag1\u30d0', 'revid-2')
218
b1.tags.set_tag(u'tag10\u30d0', 'missing') # not present in repository
219
b1.tags.set_tag(u'tag2\u30d0', 'revid-1')
222
out, err = self.run_bzr('tags -d branch1',
224
self.assertEqual(err, '')
225
self.assertContainsRe(out, (u'^tag1\u30d0 *2\ntag2\u30d0 *1\n' +
226
u'tag10\u30d0 *\\?\n').encode('utf-8'))
139
228
# lexicographical order
140
out, err = self.run_bzr('tags -d branch1', encoding='utf-8')
141
self.assertEquals(err, '')
142
self.assertContainsRe(out, (u'^tagA\u30d0 *2\ntagB\u30d0 *\\?\n' +
143
u'tagC\u30d0 *1\n').encode('utf-8'))
229
out, err = self.run_bzr('tags --sort=alpha -d branch1',
231
self.assertEqual(err, '')
232
self.assertContainsRe(out, (u'^tag10\u30d0 *\\?\ntag1\u30d0 *2\n' +
233
u'tag2\u30d0 *1\n').encode('utf-8'))
145
out, err = self.run_bzr('tags --show-ids -d branch1', encoding='utf-8')
146
self.assertEquals(err, '')
147
self.assertContainsRe(out, (u'^tagA\u30d0 *revid-2\n' +
148
u'tagB\u30d0 *missing\ntagC\u30d0 *revid-1\n').encode('utf-8'))
235
out, err = self.run_bzr('tags --sort=alpha --show-ids -d branch1',
237
self.assertEqual(err, '')
238
self.assertContainsRe(out, (u'^tag10\u30d0 *missing\n' +
239
u'tag1\u30d0 *revid-2\ntag2\u30d0 *revid-1\n').encode('utf-8'))
150
241
# chronological order
151
242
out, err = self.run_bzr('tags --sort=time -d branch1',
152
243
encoding='utf-8')
153
self.assertEquals(err, '')
154
self.assertContainsRe(out, (u'^tagC\u30d0 *1\ntagA\u30d0 *2\n' +
155
u'tagB\u30d0 *\\?\n').encode('utf-8'))
244
self.assertEqual(err, '')
245
self.assertContainsRe(out, (u'^tag2\u30d0 *1\ntag1\u30d0 *2\n' +
246
u'tag10\u30d0 *\\?\n').encode('utf-8'))
157
248
out, err = self.run_bzr('tags --sort=time --show-ids -d branch1',
158
249
encoding='utf-8')
159
self.assertEquals(err, '')
160
self.assertContainsRe(out, (u'^tagC\u30d0 *revid-1\n' +
161
u'tagA\u30d0 *revid-2\ntagB\u30d0 *missing\n').encode('utf-8'))
250
self.assertEqual(err, '')
251
self.assertContainsRe(out, (u'^tag2\u30d0 *revid-1\n' +
252
u'tag1\u30d0 *revid-2\ntag10\u30d0 *missing\n').encode('utf-8'))
163
254
# now test dotted revnos
164
255
tree2 = tree1.bzrdir.sprout('branch2').open_workingtree()
173
264
tree1.commit('merge', rev_id='revid-4')
175
266
out, err = self.run_bzr('tags -d branch1', encoding='utf-8')
176
self.assertEquals(err, '')
267
self.assertEqual(err, '')
177
268
self.assertContainsRe(out, r'tagD *2\.1\.1\n')
178
269
out, err = self.run_bzr('tags -d branch2', encoding='utf-8')
179
self.assertEquals(err, '')
270
self.assertEqual(err, '')
180
271
self.assertContainsRe(out, r'tagD *3\n')
273
def test_list_tags_dotted_revnos_unsupported(self):
274
tree = self.make_branch_and_tree('branch')
275
rev1 = tree.commit("rev1")
276
tree.branch.tags.set_tag("mytag", rev1)
277
def revision_id_to_dotted_revno(self, revid):
278
raise errors.UnsupportedOperation(revision_id_to_dotted_revno, self)
279
self.overrideAttr(Branch, "revision_id_to_dotted_revno",
280
revision_id_to_dotted_revno)
281
out, err = self.run_bzr('tags -d branch', encoding='utf-8')
282
self.assertEqual(out, 'mytag ?\n')
182
284
def test_list_tags_revision_filtering(self):
183
285
tree1 = self.make_branch_and_tree('.')
184
286
tree1.commit(allow_pointless=True, message='revision 1',
210
312
error_regexes=["bzr: ERROR: Requested revision: '123.123' "
211
313
"does not exist in branch:"])
315
def test_sort_tags_custom(self):
316
def sort_by_dots(branch, tags):
317
def sort_key((tag, revid)):
318
return tag.count(".")
319
tags.sort(key=sort_key)
321
# Register a custom sort method
322
tag.tag_sort_methods.register("dots", sort_by_dots, "Sort by dots.")
323
self.addCleanup(tag.tag_sort_methods.remove, "dots")
325
tree1 = self.make_branch_and_tree('branch1')
326
tree1.commit(allow_pointless=True, message='revision 1',
327
rev_id='revid-1', timestamp=10)
328
tree1.commit(allow_pointless=True, message='revision 2',
329
rev_id='revid-2', timestamp=15)
333
b1.tags.set_tag(u'tag..', 'revid-2')
334
b1.tags.set_tag(u'tag....', 'missing') # not present in repository
335
b1.tags.set_tag(u'tag.', 'revid-1')
336
b1.tags.set_tag(u'tag...', 'revid-1')
337
b1.tags.set_tag(u'tag....', 'revid-1')
339
# sorted by number of dots
340
out, err = self.run_bzr('tags --sort=dots -d branch1')
341
self.assertEqual(err, '')
213
349
def _check_tag_filter(self, argstr, expected_revnos):
214
350
#upper bound of laziness
215
351
out, err = self.run_bzr('tags ' + argstr)
216
self.assertEquals(err, '')
352
self.assertEqual(err, '')
217
353
self.assertContainsRe(out, "^" + ''.join(["tag %s +%s\n" % (
218
354
revno, revno) for revno in expected_revnos]) + "$")
231
367
self.assertContainsRe(out,
232
368
'Conflicting tags:\n.*' + tagname.encode('utf-8'))
233
369
# pull should give a warning about the tags
234
out, err = self.run_bzr('pull -d one two', encoding='utf-8')
370
out, err = self.run_bzr('pull -d one two', encoding='utf-8',
235
372
self.assertContainsRe(out,
236
373
'Conflicting tags:\n.*' + tagname.encode('utf-8'))
237
374
# merge should give a warning about the tags -- not implemented yet
238
375
## out, err = self.run_bzr('merge -d one two', encoding='utf-8')
239
376
## self.assertContainsRe(out,
240
377
## 'Conflicting tags:\n.*' + tagname.encode('utf-8'))
379
def test_tag_quiet(self):
380
t1 = self.make_branch_and_tree('')
381
out, err = self.run_bzr('tag --quiet test1')
382
self.assertEqual('', out)
383
self.assertEqual('', err)
385
def test_tag_delete_quiet(self):
386
t1 = self.make_branch_and_tree('')
387
self.run_bzr('tag test1')
388
out, err = self.run_bzr('tag --delete --quiet test1')
389
self.assertEqual('', out)
390
self.assertEqual('', err)
392
def test_tags_with_mainline_ghosts(self):
393
tree = self.make_branch_and_tree('tree1')
394
tree.set_parent_ids(["spooky"], allow_leftmost_as_ghost=True)
396
tree.commit('msg1', rev_id='rev1')
397
tree.commit('msg2', rev_id='rev2')
398
tree.branch.tags.set_tag('unknown', 'out-of-mainline')
399
tree.branch.tags.set_tag('ghost', 'spooky')
400
tree.branch.tags.set_tag('tag1', 'rev1')
401
tree.branch.tags.set_tag('tag2', 'rev2')
403
out, err = self.run_bzr('tags -d tree1', encoding='utf-8')
404
self.assertEqual(out,
409
self.assertEqual('', err)
412
class TestSmartServerCat(TestCaseWithTransport):
414
def test_set_tag(self):
415
self.setup_smart_server_with_call_log()
416
t = self.make_branch_and_tree('branch')
417
self.build_tree_contents([('branch/foo', 'thecontents')])
420
self.reset_smart_call_log()
421
out, err = self.run_bzr(['tag', "-d", self.get_url('branch'), "tagname"])
422
# This figure represent the amount of work to perform this use case. It
423
# is entirely ok to reduce this number if a test fails due to rpc_count
424
# being too low. If rpc_count increases, more network roundtrips have
425
# become necessary for this use case. Please do not adjust this number
426
# upwards without agreement from bzr's network support maintainers.
427
self.assertLength(9, self.hpss_calls)
428
self.assertLength(1, self.hpss_connections)
429
self.assertThat(self.hpss_calls, ContainsNoVfsCalls)
431
def test_show_tags(self):
432
self.setup_smart_server_with_call_log()
433
t = self.make_branch_and_tree('branch')
434
self.build_tree_contents([('branch/foo', 'thecontents')])
437
t.branch.tags.set_tag("sometag", "rev1")
438
t.branch.tags.set_tag("sometag", "rev2")
439
self.reset_smart_call_log()
440
out, err = self.run_bzr(['tags', "-d", self.get_url('branch')])
441
# This figure represent the amount of work to perform this use case. It
442
# is entirely ok to reduce this number if a test fails due to rpc_count
443
# being too low. If rpc_count increases, more network roundtrips have
444
# become necessary for this use case. Please do not adjust this number
445
# upwards without agreement from bzr's network support maintainers.
446
self.assertLength(6, self.hpss_calls)
447
self.assertLength(1, self.hpss_connections)
448
self.assertThat(self.hpss_calls, ContainsNoVfsCalls)