← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_revisionnamespaces.py

Late bind to PatienceSequenceMatcher to allow plugin to override.

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