/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

  • Committer: Aaron Bentley
  • Date: 2008-03-29 21:16:20 UTC
  • mto: (3298.2.13 revision_id_to_revno)
  • mto: This revision was merged to the branch mainline in revision 3328.
  • Revision ID: aaron@aaronbentley.com-20080329211620-1a91xrjinusqxudy
Update tests for null:, clea up slightly

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_revisionspec.py
50
50
        self.tree = self.make_branch_and_tree('tree')
51
51
        self.build_tree(['tree/a'])
52
52
        self.tree.lock_write()
53
 
        try:
54
 
            self.tree.add(['a'])
55
 
            self.tree.commit('a', rev_id='r1')
56
 
 
57
 
            self.tree2 = self.tree.bzrdir.sprout('tree2').open_workingtree()
58
 
            self.tree2.commit('alt', rev_id='alt_r2')
59
 
 
60
 
            self.tree.merge_from_branch(self.tree2.branch)
61
 
            self.tree.commit('second', rev_id='r2')
62
 
        finally:
63
 
            self.tree.unlock()
 
53
        self.addCleanup(self.tree.unlock)
 
54
        self.tree.add(['a'])
 
55
        self.tree.commit('a', rev_id='r1')
 
56
 
 
57
        self.tree2 = self.tree.bzrdir.sprout('tree2').open_workingtree()
 
58
        self.tree2.commit('alt', rev_id='alt_r2')
 
59
 
 
60
        self.tree.merge_from_branch(self.tree2.branch)
 
61
        self.tree.commit('second', rev_id='r2')
64
62
 
65
63
    def get_in_history(self, revision_spec):
66
64
        return spec_in_history(revision_spec, self.tree.branch)
96
94
    """Test things that aren't normally thought of as revision specs"""
97
95
 
98
96
    def test_none(self):
99
 
        self.assertInHistoryIs(0, None, None)
 
97
        self.assertInHistoryIs(None, None, None)
100
98
 
101
99
    def test_object(self):
102
100
        self.assertRaises(TypeError, RevisionSpec.from_string, object())
255
253
                         spec_in_history('revno:2:b/', None))
256
254
 
257
255
    def test_as_revision_id(self):
 
256
        self.assertAsRevisionId('null:', '0')
258
257
        self.assertAsRevisionId('r1', '1')
259
258
        self.assertAsRevisionId('r2', '2')
260
259
        self.assertAsRevisionId('r1', '-2')
369
368
        self.assertInHistoryIs(0, 'null:', 'before:revid:new_r1')
370
369
 
371
370
    def test_as_revision_id(self):
372
 
        self.tree.lock_read()
373
 
        self.addCleanup(self.tree.unlock)
374
371
        self.assertAsRevisionId('r1', 'before:revid:r2')
375
372
        self.assertAsRevisionId('r1', 'before:2')
376
373
        self.assertAsRevisionId('r1', 'before:1.1.1')
392
389
    def test_lookup_tag(self):
393
390
        self.tree.branch.tags.set_tag('bzr-0.14', 'r1')
394
391
        self.assertInHistoryIs(1, 'r1', 'tag:bzr-0.14')
 
392
        self.tree.branch.tags.set_tag('null_rev', 'null:')
 
393
        self.assertInHistoryIs(0, 'null:', 'tag:null_rev')
395
394
 
396
395
    def test_failed_lookup(self):
397
396
        # tags that don't exist give a specific message: arguably we should
402
401
 
403
402
    def test_as_revision_id(self):
404
403
        self.tree.branch.tags.set_tag('my-tag', 'r2')
 
404
        self.tree.branch.tags.set_tag('null_rev', 'null:')
405
405
        self.assertAsRevisionId('r2', 'tag:my-tag')
 
406
        self.assertAsRevisionId('null:', 'tag:null_rev')
406
407
        self.assertAsRevisionId('r1', 'before:tag:my-tag')
407
408
 
408
409