← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_revisionnamespaces.py

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_revisionnamespaces.py
1
 
# Copyright (C) 2004, 2005, 2006 Canonical Ltd
 
1
# Copyright (C) 2004, 2005, 2006, 2007 Canonical Ltd
2
2
#
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
19
19
import time
20
20
 
21
21
from bzrlib import (
 
22
    branch,
 
23
    bzrdir,
22
24
    errors,
 
25
    repository,
23
26
    )
24
27
from bzrlib.builtins import merge
25
28
from bzrlib.tests import TestCase, TestCaseWithTransport
26
 
from bzrlib.revisionspec import RevisionSpec, RevisionSpec_revno
 
29
from bzrlib.revisionspec import (
 
30
    RevisionSpec,
 
31
    RevisionSpec_revno,
 
32
    RevisionSpec_tag,
 
33
    )
27
34
 
28
35
 
29
36
def spec_in_history(spec, branch):
60
67
    def assertInHistoryIs(self, exp_revno, exp_revision_id, revision_spec):
61
68
        rev_info = self.get_in_history(revision_spec)
62
69
        self.assertEqual(exp_revno, rev_info.revno,
63
 
                         'Revision spec: %s returned wrong revno: %s != %s'
 
70
                         'Revision spec: %r returned wrong revno: %r != %r'
64
71
                         % (revision_spec, exp_revno, rev_info.revno))
65
72
        self.assertEqual(exp_revision_id, rev_info.rev_id,
66
 
                         'Revision spec: %s returned wrong revision id:'
67
 
                         ' %s != %s'
 
73
                         'Revision spec: %r returned wrong revision id:'
 
74
                         ' %r != %r'
68
75
                         % (revision_spec, exp_revision_id, rev_info.rev_id))
69
76
 
70
77
    def assertInvalid(self, revision_spec, extra=''):
270
277
                                          revision_id='alt_r3')
271
278
        self.assertInHistoryIs(None, 'alt_r3', 'revid:alt_r3')
272
279
 
 
280
    def test_unicode(self):
 
281
        """We correctly convert a unicode ui string to an encoded revid."""
 
282
        revision_id = u'\N{SNOWMAN}'.encode('utf-8')
 
283
        self.tree.commit('unicode', rev_id=revision_id)
 
284
        self.assertInHistoryIs(3, revision_id, u'revid:\N{SNOWMAN}')
 
285
        self.assertInHistoryIs(3, revision_id, 'revid:' + revision_id)
 
286
 
273
287
 
274
288
class TestRevisionSpec_last(TestRevisionSpec):
275
289
 
335
349
 
336
350
class TestRevisionSpec_tag(TestRevisionSpec):
337
351
    
338
 
    def test_invalid(self):
339
 
        self.assertInvalid('tag:foo', extra='\ntag: namespace registered,'
340
 
                                            ' but not implemented')
 
352
    def make_branch_and_tree(self, relpath):
 
353
        # override format as the default one may not support tags
 
354
        control = bzrdir.BzrDir.create(relpath)
 
355
        control.create_repository()
 
356
        branch.BzrBranchExperimental.initialize(control)
 
357
        return control.create_workingtree()
 
358
 
 
359
    def test_from_string_tag(self):
 
360
        spec = RevisionSpec.from_string('tag:bzr-0.14')
 
361
        self.assertIsInstance(spec, RevisionSpec_tag)
 
362
        self.assertEqual(spec.spec, 'bzr-0.14')
 
363
 
 
364
    def test_lookup_tag(self):
 
365
        self.tree.branch.tags.set_tag('bzr-0.14', 'r1')
 
366
        self.assertInHistoryIs(1, 'r1', 'tag:bzr-0.14')
 
367
 
 
368
    def test_failed_lookup(self):
 
369
        # tags that don't exist give a specific message: arguably we should
 
370
        # just give InvalidRevisionSpec but I think this is more helpful
 
371
        self.assertRaises(errors.NoSuchTag,
 
372
            self.get_in_history,
 
373
            'tag:some-random-tag')
341
374
 
342
375
 
343
376
class TestRevisionSpec_date(TestRevisionSpec):
451
484
        new_tree = self.make_branch_and_tree('new_tree')
452
485
        self.assertRaises(errors.NoCommits,
453
486
                          self.get_in_history, 'branch:new_tree')
 
487
 
 
488
 
 
489
class TestRevisionSpec_submit(TestRevisionSpec):
 
490
 
 
491
    def test_submit_branch(self):
 
492
        # Common ancestor of trees is 'alt_r2'
 
493
        self.assertRaises(errors.NoSubmitBranch, self.get_in_history,
 
494
                          'submit:')
 
495
        self.tree.branch.set_parent('../tree2')
 
496
        self.assertInHistoryIs(None, 'alt_r2', 'submit:')
 
497
        self.tree.branch.set_parent('bogus')
 
498
        self.assertRaises(errors.NotBranchError, self.get_in_history,
 
499
            'submit:')
 
500
        # submit branch overrides parent branch
 
501
        self.tree.branch.set_submit_branch('tree2')
 
502
        self.assertInHistoryIs(None, 'alt_r2', 'submit:')