← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_revisionnamespaces.py

Move working tree initialisation out from  Branch.initialize, deprecated Branch.initialize to Branch.create.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_revisionnamespaces.py
18
18
import time
19
19
 
20
20
from bzrlib.branch import Branch
21
 
from bzrlib.tests import TestCaseInTempDir
 
21
from bzrlib.tests import TestCaseWithTransport
22
22
from bzrlib.errors import NoCommonAncestor, NoCommits
23
23
from bzrlib.errors import NoSuchRevision
24
24
from bzrlib.clone import copy_branch
25
25
from bzrlib.merge import merge
26
26
from bzrlib.revisionspec import RevisionSpec
27
 
 
28
 
class TestRevisionNamespaces(TestCaseInTempDir):
 
27
from bzrlib.workingtree import WorkingTree
 
28
 
 
29
 
 
30
class TestRevisionNamespaces(TestCaseWithTransport):
29
31
 
30
32
    def test_revision_namespaces(self):
31
33
        """Test revision specifiers.
32
34
 
33
35
        These identify revisions by date, etc."""
34
 
 
35
 
        b = Branch.initialize(u'.')
36
 
 
37
 
        b.working_tree().commit('Commit one', rev_id='a@r-0-1', timestamp=time.time() - 60*60*24)
38
 
        b.working_tree().commit('Commit two', rev_id='a@r-0-2')
39
 
        b.working_tree().commit('Commit three', rev_id='a@r-0-3')
 
36
        wt = self.make_branch_and_tree('.')
 
37
        b = wt.branch
 
38
 
 
39
        wt.commit('Commit one', rev_id='a@r-0-1', timestamp=time.time() - 60*60*24)
 
40
        wt.commit('Commit two', rev_id='a@r-0-2')
 
41
        wt.commit('Commit three', rev_id='a@r-0-3')
40
42
 
41
43
        self.assertEquals(RevisionSpec(None).in_history(b), (0, None))
42
44
        self.assertEquals(RevisionSpec(1).in_history(b), (1, 'a@r-0-1'))
65
67
                          'a@r-0-3')
66
68
 
67
69
        os.mkdir('newbranch')
68
 
        b2 = Branch.initialize('newbranch')
 
70
        wt2 = self.make_branch_and_tree('newbranch')
 
71
        b2 = wt2.branch
69
72
        self.assertRaises(NoCommits, RevisionSpec('ancestor:.').in_history, b2)
70
73
 
71
74
        os.mkdir('copy')
72
75
        b3 = copy_branch(b, 'copy')
73
 
        b3.working_tree().commit('Commit four', rev_id='b@r-0-4')
 
76
        wt3 = WorkingTree('copy', b3)
 
77
        wt3.commit('Commit four', rev_id='b@r-0-4')
74
78
        self.assertEquals(RevisionSpec('ancestor:.').in_history(b3).rev_id,
75
79
                          'a@r-0-3')
76
80
        merge(['copy', -1], [None, None])
77
 
        b.working_tree().commit('Commit five', rev_id='a@r-0-4')
 
81
        wt.commit('Commit five', rev_id='a@r-0-4')
78
82
        self.assertEquals(RevisionSpec('ancestor:copy').in_history(b).rev_id,
79
83
                          'b@r-0-4')
80
84
        self.assertEquals(RevisionSpec('ancestor:.').in_history(b3).rev_id,
87
91
    def test_branch_namespace(self):
88
92
        """Ensure that the branch namespace pulls in the requisite content."""
89
93
        self.build_tree(['branch1/', 'branch1/file', 'branch2/'])
90
 
        branch = Branch.initialize('branch1')
91
 
        branch.working_tree().add(['file'])
92
 
        branch.working_tree().commit('add file')
 
94
        wt = self.make_branch_and_tree('branch1')
 
95
        branch = wt.branch
 
96
        wt.add(['file'])
 
97
        wt.commit('add file')
93
98
        copy_branch(branch, 'branch2')
94
99
        print >> open('branch2/file', 'w'), 'new content'
95
100
        branch2 = Branch.open('branch2')
96
 
        branch2.working_tree().commit('update file', rev_id='A')
 
101
        WorkingTree('branch2', branch2).commit('update file', rev_id='A')
97
102
        spec = RevisionSpec('branch:./branch2/.bzr/../')
98
103
        rev_info = spec.in_history(branch)
99
104
        self.assertEqual(rev_info, (None, 'A'))