← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_revisionnamespaces.py

Handled simultaneous renames of parent and child better

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_revisionnamespaces.py
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
import os
18
 
from bzrlib.selftest import TestCaseInTempDir
19
 
 
20
 
class TestRevisionNamespaces(TestCaseInTempDir):
 
18
import time
 
19
 
 
20
from bzrlib.builtins import merge
 
21
from bzrlib.branch import Branch
 
22
from bzrlib.tests import TestCaseWithTransport
 
23
from bzrlib.errors import NoCommonAncestor, NoCommits
 
24
from bzrlib.errors import NoSuchRevision
 
25
from bzrlib.revisionspec import RevisionSpec
 
26
from bzrlib.workingtree import WorkingTree
 
27
 
 
28
 
 
29
class TestRevisionNamespaces(TestCaseWithTransport):
 
30
 
21
31
    def test_revision_namespaces(self):
22
 
        """Functional tests for hashcache"""
23
 
        from bzrlib.errors import NoSuchRevision
24
 
        from bzrlib.branch import Branch
25
 
 
26
 
        b = Branch('.', init=True)
27
 
 
28
 
        b.commit('Commit one', rev_id='a@r-0-1')
29
 
        b.commit('Commit two', rev_id='a@r-0-2')
30
 
        b.commit('Commit three', rev_id='a@r-0-3')
31
 
 
32
 
        self.assertEquals(b.get_revision_info(None), (0, None))
33
 
        self.assertEquals(b.get_revision_info(1), (1, 'a@r-0-1'))
34
 
        self.assertEquals(b.get_revision_info('revno:1'), (1, 'a@r-0-1'))
35
 
        self.assertEquals(b.get_revision_info('revid:a@r-0-1'), (1, 'a@r-0-1'))
36
 
        self.assertRaises(NoSuchRevision, b.get_revision_info, 'revid:a@r-0-0')
37
 
        self.assertRaises(TypeError, b.get_revision_info, object)
38
 
 
39
 
        self.assertEquals(b.get_revision_info('date:-tomorrow'), (3, 'a@r-0-3'))
40
 
        self.assertEquals(b.get_revision_info('date:+today'), (1, 'a@r-0-1'))
41
 
 
42
 
        self.assertEquals(b.get_revision_info('last:1'), (3, 'a@r-0-3'))
43
 
        self.assertEquals(b.get_revision_info('-1'), (3, 'a@r-0-3'))
 
32
        """Test revision specifiers.
 
33
 
 
34
        These identify revisions by date, etc."""
 
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')
 
41
 
 
42
        self.assertEquals(RevisionSpec(None).in_history(b), (0, None))
 
43
        self.assertEquals(RevisionSpec(1).in_history(b), (1, 'a@r-0-1'))
 
44
        self.assertEquals(RevisionSpec('revno:1').in_history(b),
 
45
                          (1, 'a@r-0-1'))
 
46
        self.assertEquals(RevisionSpec('revid:a@r-0-1').in_history(b),
 
47
                          (1, 'a@r-0-1'))
 
48
        self.assertRaises(NoSuchRevision,
 
49
                          RevisionSpec('revid:a@r-0-0').in_history, b)
 
50
        self.assertRaises(TypeError, RevisionSpec, object)
 
51
 
 
52
        self.assertEquals(RevisionSpec('date:today').in_history(b),
 
53
                          (2, 'a@r-0-2'))
 
54
        self.assertEquals(RevisionSpec('date:yesterday').in_history(b),
 
55
                          (1, 'a@r-0-1'))
 
56
        self.assertEquals(RevisionSpec('before:date:today').in_history(b),
 
57
                          (1, 'a@r-0-1'))
 
58
 
 
59
        self.assertEquals(RevisionSpec('last:1').in_history(b),
 
60
                          (3, 'a@r-0-3'))
 
61
        self.assertEquals(RevisionSpec('-1').in_history(b), (3, 'a@r-0-3'))
 
62
#        self.assertEquals(b.get_revision_info('last:1'), (3, 'a@r-0-3'))
 
63
#        self.assertEquals(b.get_revision_info('-1'), (3, 'a@r-0-3'))
 
64
 
 
65
        self.assertEquals(RevisionSpec('ancestor:.').in_history(b).rev_id,
 
66
                          'a@r-0-3')
44
67
 
45
68
        os.mkdir('newbranch')
46
 
        b2 = Branch('newbranch', init=True)
47
 
        self.assertEquals(b2.lookup_revision('revid:a@r-0-1'), 'a@r-0-1')
 
69
        wt2 = self.make_branch_and_tree('newbranch')
 
70
        b2 = wt2.branch
 
71
        self.assertRaises(NoCommits, RevisionSpec('ancestor:.').in_history, b2)
 
72
 
 
73
        os.mkdir('copy')
 
74
        b3 = b.clone('copy')
 
75
        wt3 = WorkingTree('copy', b3)
 
76
        wt3.commit('Commit four', rev_id='b@r-0-4')
 
77
        self.assertEquals(RevisionSpec('ancestor:.').in_history(b3).rev_id,
 
78
                          'a@r-0-3')
 
79
        merge(['copy', -1], [None, None])
 
80
        wt.commit('Commit five', rev_id='a@r-0-4')
 
81
        self.assertEquals(RevisionSpec('ancestor:copy').in_history(b).rev_id,
 
82
                          'b@r-0-4')
 
83
        self.assertEquals(RevisionSpec('ancestor:.').in_history(b3).rev_id,
 
84
                          'b@r-0-4')
 
85
 
 
86
        # This should be in the revision store, but not in revision-history
 
87
        self.assertEquals((None, 'b@r-0-4'),
 
88
                RevisionSpec('revid:b@r-0-4').in_history(b))
 
89
 
 
90
    def test_branch_namespace(self):
 
91
        """Ensure that the branch namespace pulls in the requisite content."""
 
92
        self.build_tree(['branch1/', 'branch1/file', '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')
 
98
        print >> open('branch2/file', 'w'), 'new content'
 
99
        branch2 = Branch.open('branch2')
 
100
        WorkingTree('branch2', branch2).commit('update file', rev_id='A')
 
101
        spec = RevisionSpec('branch:./branch2/.bzr/../')
 
102
        rev_info = spec.in_history(branch)
 
103
        self.assertEqual(rev_info, (None, 'A'))
 
104