← 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] update from bzr.dev

Show diffs side-by-side

added added

removed removed

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