/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_revisionspec.py

1st cut merge of bzr.dev r3907

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_revisionspec.py
23
23
    bzrdir,
24
24
    errors,
25
25
    repository,
 
26
    revision as _mod_revision,
26
27
    )
27
28
from bzrlib.tests import TestCase, TestCaseWithTransport
28
29
from bzrlib.revisionspec import (
100
101
        self.assertEqual(revision_id,
101
102
                         spec.as_revision_id(self.tree.branch))
102
103
 
 
104
    def get_as_tree(self, revision_spec, tree=None):
 
105
        if tree is None:
 
106
            tree = self.tree
 
107
        spec = RevisionSpec.from_string(revision_spec)
 
108
        return spec.as_tree(tree.branch)
 
109
 
103
110
 
104
111
class RevisionSpecMatchOnTrap(RevisionSpec):
105
112
 
169
176
 
170
177
    def test_dotted_decimal(self):
171
178
        self.assertInHistoryIs(None, 'alt_r2', '1.1.1')
 
179
        self.assertInvalid('1.1.123')
172
180
 
173
181
    def test_negative_int(self):
174
182
        self.assertInHistoryIs(2, 'r2', '-1')
300
308
        self.assertAsRevisionId('r2', '-1')
301
309
        self.assertAsRevisionId('alt_r2', '1.1.1')
302
310
 
 
311
    def test_as_tree(self):
 
312
        tree = self.get_as_tree('0')
 
313
        self.assertEquals(_mod_revision.NULL_REVISION, tree.get_revision_id())
 
314
        tree = self.get_as_tree('1')
 
315
        self.assertEquals('r1', tree.get_revision_id())
 
316
        tree = self.get_as_tree('2')
 
317
        self.assertEquals('r2', tree.get_revision_id())
 
318
        tree = self.get_as_tree('-2')
 
319
        self.assertEquals('r1', tree.get_revision_id())
 
320
        tree = self.get_as_tree('-1')
 
321
        self.assertEquals('r2', tree.get_revision_id())
 
322
        tree = self.get_as_tree('1.1.1')
 
323
        self.assertEquals('alt_r2', tree.get_revision_id())
 
324
 
303
325
 
304
326
class TestRevisionSpec_revid(TestRevisionSpec):
305
327
    
564
586
        new_tree = self.make_branch_and_tree('new_tree')
565
587
        self.assertRaises(errors.NoCommits,
566
588
                          self.get_in_history, 'branch:new_tree')
 
589
        self.assertRaises(errors.NoCommits,
 
590
                          self.get_as_tree, 'branch:new_tree')
567
591
 
568
592
    def test_as_revision_id(self):
569
593
        self.assertAsRevisionId('alt_r2', 'branch:tree2')
570
594
 
 
595
    def test_as_tree(self):
 
596
        tree = self.get_as_tree('branch:tree', self.tree2)
 
597
        self.assertEquals('r2', tree.get_revision_id())
 
598
        self.assertFalse(self.tree2.branch.repository.has_revision('r2'))
 
599
 
571
600
 
572
601
class TestRevisionSpec_submit(TestRevisionSpec):
573
602