← 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-09-27 07:24:40 UTC
  • mfrom: (1185.1.41)
  • Revision ID: robertc@robertcollins.net-20050927072440-1bf4d99c3e1db5b3
pair programming worx... merge integration and weave

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testrevisionnamespaces.py
16
16
 
17
17
import os
18
18
import time
19
 
 
20
 
from bzrlib.builtins import merge
21
 
from bzrlib.branch import Branch
22
 
from bzrlib.tests import TestCaseWithTransport
 
19
from bzrlib.selftest import TestCaseInTempDir
23
20
from bzrlib.errors import NoCommonAncestor, NoCommits
24
 
from bzrlib.errors import NoSuchRevision
25
 
from bzrlib.revisionspec import RevisionSpec
26
 
 
27
 
 
28
 
class TestRevisionNamespaces(TestCaseWithTransport):
 
21
from bzrlib.branch import copy_branch
 
22
from bzrlib.merge import merge
 
23
 
 
24
class TestRevisionNamespaces(TestCaseInTempDir):
29
25
 
30
26
    def test_revision_namespaces(self):
31
27
        """Test revision specifiers.
32
28
 
33
29
        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')
 
30
        from bzrlib.errors import NoSuchRevision
 
31
        from bzrlib.branch import Branch
 
32
        from bzrlib.revisionspec import RevisionSpec
 
33
 
 
34
        b = Branch.initialize('.')
 
35
 
 
36
        b.commit('Commit one', rev_id='a@r-0-1', timestamp=time.time() - 60*60*24)
 
37
        b.commit('Commit two', rev_id='a@r-0-2')
 
38
        b.commit('Commit three', rev_id='a@r-0-3')
40
39
 
41
40
        self.assertEquals(RevisionSpec(None).in_history(b), (0, None))
42
41
        self.assertEquals(RevisionSpec(1).in_history(b), (1, 'a@r-0-1'))
65
64
                          'a@r-0-3')
66
65
 
67
66
        os.mkdir('newbranch')
68
 
        wt2 = self.make_branch_and_tree('newbranch')
69
 
        b2 = wt2.branch
 
67
        b2 = Branch.initialize('newbranch')
70
68
        self.assertRaises(NoCommits, RevisionSpec('ancestor:.').in_history, b2)
71
69
 
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')
 
70
        os.mkdir('copy')
 
71
        b3 = copy_branch(b, 'copy')
 
72
        b3.commit('Commit four', rev_id='b@r-0-4')
76
73
        self.assertEquals(RevisionSpec('ancestor:.').in_history(b3).rev_id,
77
74
                          'a@r-0-3')
78
75
        merge(['copy', -1], [None, None])
79
 
        wt.commit('Commit five', rev_id='a@r-0-4')
 
76
        b.commit('Commit five', rev_id='a@r-0-4')
80
77
        self.assertEquals(RevisionSpec('ancestor:copy').in_history(b).rev_id,
81
78
                          'b@r-0-4')
82
79
        self.assertEquals(RevisionSpec('ancestor:.').in_history(b3).rev_id,
83
80
                          'b@r-0-4')
84
 
 
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
 
    def test_branch_namespace(self):
90
 
        """Ensure that the branch namespace pulls in the requisite content."""
91
 
        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')
97
 
        print >> open('branch2/file', 'w'), 'new content'
98
 
        branch2 = d2.open_branch()
99
 
        d2.open_workingtree().commit('update file', rev_id='A')
100
 
        spec = RevisionSpec('branch:./branch2/.bzr/../')
101
 
        rev_info = spec.in_history(branch)
102
 
        self.assertEqual(rev_info, (None, 'A'))
103