~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testrevisionnamespaces.py

  • Committer: Lalo Martins
  • Date: 2005-09-09 11:37:44 UTC
  • mto: (1185.1.22)
  • mto: This revision was merged to the branch mainline in revision 1390.
  • Revision ID: lalo@exoweb.net-20050909113744-22f870db25a9e5f5
getting rid of everything that calls the Branch constructor directly

Show diffs side-by-side

added added

removed removed

Lines of Context:
16
16
 
17
17
import os
18
18
from bzrlib.selftest import TestCaseInTempDir
19
 
from bzrlib.errors import NoCommonAncestor, NoCommits
20
 
from bzrlib.branch import copy_branch
21
 
from bzrlib.merge import merge
22
19
 
23
20
class TestRevisionNamespaces(TestCaseInTempDir):
24
21
    def test_revision_namespaces(self):
25
22
        """Functional tests for hashcache"""
26
23
        from bzrlib.errors import NoSuchRevision
27
24
        from bzrlib.branch import Branch
 
25
        from bzrlib.revisionspec import RevisionSpec
28
26
 
29
 
        b = Branch('.', init=True)
 
27
        b = Branch.initialize('.')
30
28
 
31
29
        b.commit('Commit one', rev_id='a@r-0-1')
32
30
        b.commit('Commit two', rev_id='a@r-0-2')
33
31
        b.commit('Commit three', rev_id='a@r-0-3')
34
32
 
35
 
        self.assertEquals(b.get_revision_info(None), (0, None))
36
 
        self.assertEquals(b.get_revision_info(1), (1, 'a@r-0-1'))
37
 
        self.assertEquals(b.get_revision_info('revno:1'), (1, 'a@r-0-1'))
38
 
        self.assertEquals(b.get_revision_info('revid:a@r-0-1'), (1, 'a@r-0-1'))
39
 
        self.assertRaises(NoSuchRevision, b.get_revision_info, 'revid:a@r-0-0')
40
 
        self.assertRaises(TypeError, b.get_revision_info, object)
41
 
 
42
 
        self.assertEquals(b.get_revision_info('date:-tomorrow'), (3, 'a@r-0-3'))
43
 
        self.assertEquals(b.get_revision_info('date:+today'), (1, 'a@r-0-1'))
44
 
 
45
 
        self.assertEquals(b.get_revision_info('last:1'), (3, 'a@r-0-3'))
46
 
        self.assertEquals(b.get_revision_info('-1'), (3, 'a@r-0-3'))
47
 
 
48
 
        os.mkdir('newbranch')
49
 
        b2 = Branch('newbranch', init=True)
50
 
        self.assertEquals(b2.lookup_revision('revid:a@r-0-1'), 'a@r-0-1')
51
 
 
52
 
        self.assertRaises(NoCommits, b2.lookup_revision, 'ancestor:.')
53
 
        self.assertEquals(b.lookup_revision('ancestor:.'), 'a@r-0-3')
54
 
        os.mkdir('copy')
55
 
        b3 = copy_branch(b, 'copy')
56
 
        b3.commit('Commit four', rev_id='b@r-0-4')
57
 
        self.assertEquals(b3.lookup_revision('ancestor:.'), 'a@r-0-3')
58
 
        merge(['copy', -1], [None, None])
59
 
        b.commit('Commit five', rev_id='a@r-0-4')
60
 
        self.assertEquals(b.lookup_revision('ancestor:copy'), 'b@r-0-4')
61
 
        self.assertEquals(b3.lookup_revision('ancestor:.'), 'b@r-0-4')
 
33
        self.assertEquals(RevisionSpec(b, None), (0, None))
 
34
        self.assertEquals(RevisionSpec(b, 1), (1, 'a@r-0-1'))
 
35
        self.assertEquals(RevisionSpec(b, 'revno:1'), (1, 'a@r-0-1'))
 
36
        self.assertEquals(RevisionSpec(b, 'revid:a@r-0-1'), (1, 'a@r-0-1'))
 
37
        self.assertRaises(NoSuchRevision, RevisionSpec, b, 'revid:a@r-0-0')
 
38
        self.assertRaises(TypeError, RevisionSpec, b, object)
 
39
 
 
40
        self.assertEquals(RevisionSpec(b, 'date:-tomorrow'), (3, 'a@r-0-3'))
 
41
        self.assertEquals(RevisionSpec(b, 'date:+today'), (1, 'a@r-0-1'))
 
42
 
 
43
        self.assertEquals(RevisionSpec(b, 'last:1'), (3, 'a@r-0-3'))
 
44
        self.assertEquals(RevisionSpec(b, '-1'), (3, 'a@r-0-3'))