← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_tags.py

  • Committer: Jelmer Vernooij
  • Date: 2012-02-20 12:19:29 UTC
  • mfrom: (6437.23.11 2.5)
  • mto: (6581.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 6582.
  • Revision ID: jelmer@samba.org-20120220121929-7ni2psvjoatm1yp4
Merge bzr/2.5.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_tags.py
17
17
"""Tests for commands related to tags"""
18
18
 
19
19
from bzrlib import (
20
 
    branchbuilder,
 
20
    errors,
21
21
    tag,
22
22
    transform,
23
23
    )
28
28
    script,
29
29
    TestCaseWithTransport,
30
30
    )
 
31
from bzrlib.tests.matchers import ContainsNoVfsCalls
31
32
from bzrlib.workingtree import WorkingTree
32
33
 
33
34
 
75
76
        # can also delete an existing tag
76
77
        out, err = self.run_bzr('tag --delete -d branch tag2')
77
78
        # cannot replace an existing tag normally
78
 
        out, err = self.run_bzr('tag -d branch NEWTAG', retcode=3)
 
79
        out, err = self.run_bzr('tag -d branch NEWTAG -r0', retcode=3)
79
80
        self.assertContainsRe(err, 'Tag NEWTAG already exists\\.')
80
81
        # ... but can if you use --force
81
 
        out, err = self.run_bzr('tag -d branch NEWTAG --force')
 
82
        out, err = self.run_bzr('tag -d branch NEWTAG --force -r0')
 
83
        self.assertEquals("Updated tag NEWTAG.\n", err)
 
84
 
 
85
    def test_tag_same_revision(self):
 
86
        t = self.make_branch_and_tree('branch')
 
87
        t.commit(allow_pointless=True, message='initial commit',
 
88
            rev_id='first-revid')
 
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',
 
96
            retcode=3)
 
97
        self.assertContainsRe(err, 'Tag NEWTAG already exists\\.')
82
98
 
83
99
    def test_tag_delete_requires_name(self):
84
100
        out, err = self.run_bzr('tag -d branch', retcode=3)
254
270
        self.assertEquals(err, '')
255
271
        self.assertContainsRe(out, r'tagD  *3\n')
256
272
 
 
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.assertEquals(out, 'mytag                ?\n')
 
283
 
257
284
    def test_list_tags_revision_filtering(self):
258
285
        tree1 = self.make_branch_and_tree('.')
259
286
        tree1.commit(allow_pointless=True, message='revision 1',
380
407
            'tag2                 2\n'
381
408
            'unknown              ?\n')
382
409
        self.assertEqual('', err)
 
410
 
 
411
 
 
412
class TestSmartServerCat(TestCaseWithTransport):
 
413
 
 
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')])
 
418
        t.add("foo")
 
419
        t.commit("message")
 
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)
 
430
 
 
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')])
 
435
        t.add("foo")
 
436
        t.commit("message")
 
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)