← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testrevisionnamespaces.py

Update news and readme

- better explanation of dependencies

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'))
50
50
 
51
51
        self.assertEquals(RevisionSpec('date:today').in_history(b),
52
52
                          (2, 'a@r-0-2'))
53
 
        self.assertRaises(NoSuchRevision,
54
 
                          RevisionSpec('date:tomorrow').in_history, b)
55
53
        self.assertEquals(RevisionSpec('date:yesterday').in_history(b),
56
54
                          (1, 'a@r-0-1'))
57
55
        self.assertEquals(RevisionSpec('before:date:today').in_history(b),
58
56
                          (1, 'a@r-0-1'))
59
 
        self.assertRaises(NoSuchRevision,
60
 
                          RevisionSpec('date:tomorrow').in_history, b)
61
57
 
62
58
        self.assertEquals(RevisionSpec('last:1').in_history(b),
63
59
                          (3, 'a@r-0-3'))
69
65
                          'a@r-0-3')
70
66
 
71
67
        os.mkdir('newbranch')
72
 
        wt2 = self.make_branch_and_tree('newbranch')
73
 
        b2 = wt2.branch
 
68
        b2 = Branch.initialize('newbranch')
74
69
        self.assertRaises(NoCommits, RevisionSpec('ancestor:.').in_history, b2)
75
70
 
76
 
        d3 = b.bzrdir.sprout('copy')
77
 
        b3 = d3.open_branch()
78
 
        wt3 = d3.open_workingtree()
79
 
        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')
80
74
        self.assertEquals(RevisionSpec('ancestor:.').in_history(b3).rev_id,
81
75
                          'a@r-0-3')
82
76
        merge(['copy', -1], [None, None])
83
 
        wt.commit('Commit five', rev_id='a@r-0-4')
 
77
        b.commit('Commit five', rev_id='a@r-0-4')
84
78
        self.assertEquals(RevisionSpec('ancestor:copy').in_history(b).rev_id,
85
79
                          'b@r-0-4')
86
80
        self.assertEquals(RevisionSpec('ancestor:.').in_history(b3).rev_id,
87
81
                          'b@r-0-4')
88
82
 
89
 
        # This should be in the revision store, but not in revision-history
90
 
        self.assertEquals((None, 'b@r-0-4'),
91
 
                RevisionSpec('revid:b@r-0-4').in_history(b))
92
 
 
93
83
    def test_branch_namespace(self):
94
84
        """Ensure that the branch namespace pulls in the requisite content."""
95
85
        self.build_tree(['branch1/', 'branch1/file', 'branch2/'])
96
 
        wt = self.make_branch_and_tree('branch1')
97
 
        branch = wt.branch
98
 
        wt.add(['file'])
99
 
        wt.commit('add file')
100
 
        d2 = branch.bzrdir.sprout('branch2')
 
86
        branch = Branch.initialize('branch1')
 
87
        branch.add(['file'])
 
88
        branch.commit('add file')
 
89
        copy_branch(branch, 'branch2')
101
90
        print >> open('branch2/file', 'w'), 'new content'
102
 
        branch2 = d2.open_branch()
103
 
        d2.open_workingtree().commit('update file', rev_id='A')
 
91
        branch2 = Branch.open('branch2')
 
92
        branch2.commit('update file', rev_id='A')
104
93
        spec = RevisionSpec('branch:./branch2/.bzr/../')
105
94
        rev_info = spec.in_history(branch)
106
95
        self.assertEqual(rev_info, (None, 'A'))