← 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: Vincent Ladeuil
  • Date: 2011-10-04 11:38:49 UTC
  • mfrom: (6184 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6185.
  • Revision ID: v.ladeuil+lp@free.fr-20111004113849-9os4pc4swnvdklxk
Merge trunk to resolve conflicts

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
    errors,
20
21
    tag,
21
22
    transform,
22
23
    )
268
269
        self.assertEquals(err, '')
269
270
        self.assertContainsRe(out, r'tagD  *3\n')
270
271
 
 
272
    def test_list_tags_dotted_revnos_unsupported(self):
 
273
        tree = self.make_branch_and_tree('branch')
 
274
        rev1 = tree.commit("rev1")
 
275
        tree.branch.tags.set_tag("mytag", rev1)
 
276
        def revision_id_to_dotted_revno(self, revid):
 
277
            raise errors.UnsupportedOperation(revision_id_to_dotted_revno, self)
 
278
        self.overrideAttr(Branch, "revision_id_to_dotted_revno",
 
279
            revision_id_to_dotted_revno)
 
280
        out, err = self.run_bzr('tags -d branch', encoding='utf-8')
 
281
        self.assertEquals(out, 'mytag                ?\n')
 
282
 
271
283
    def test_list_tags_revision_filtering(self):
272
284
        tree1 = self.make_branch_and_tree('.')
273
285
        tree1.commit(allow_pointless=True, message='revision 1',