← 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] land Robert's branch-formats branch

Show diffs side-by-side

added added

removed removed

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