← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testrevisionnamespaces.py

  • Committer: Robert Collins
  • Date: 2005-10-18 05:26:22 UTC
  • mto: This revision was merged to the branch mainline in revision 1463.
  • Revision ID: robertc@robertcollins.net-20051018052622-653d638c9e26fde4
fix broken tests

Show diffs side-by-side

added added

removed removed

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