← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testrevisionnamespaces.py

  • Committer: Martin Pool
  • Date: 2005-07-22 22:37:53 UTC
  • Revision ID: mbp@sourcefrog.net-20050722223753-7dced4e32d3ce21d
- add the start of a test for inventory file-id matching

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testrevisionnamespaces.py
1
 
# Copyright (C) 2004, 2005, 2006 by Canonical Ltd
 
1
# Copyright (C) 2004, 2005 by Canonical Ltd
2
2
 
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
 
import os
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
 
 
27
 
 
28
 
class TestRevisionNamespaces(TestCaseWithTransport):
29
 
 
30
 
    def test_revno_n_path(self):
31
 
        """Test revision specifiers.
32
 
 
33
 
        These identify revisions by date, etc."""
34
 
        wta = self.make_branch_and_tree('a')
35
 
        ba = wta.branch
36
 
        
37
 
        wta.commit('Commit one', rev_id='a@r-0-1')
38
 
        wta.commit('Commit two', rev_id='a@r-0-2')
39
 
        wta.commit('Commit three', rev_id='a@r-0-3')
40
 
 
41
 
        wtb = self.make_branch_and_tree('b')
42
 
        bb = wtb.branch
43
 
 
44
 
        wtb.commit('Commit one', rev_id='b@r-0-1')
45
 
        wtb.commit('Commit two', rev_id='b@r-0-2')
46
 
        wtb.commit('Commit three', rev_id='b@r-0-3')
47
 
 
48
 
        self.assertEquals(RevisionSpec('revno:1:a/').in_history(ba),
49
 
                          (1, 'a@r-0-1'))
50
 
        # The argument of in_history should be ignored since it is
51
 
        # redundant with the path in the spec.
52
 
        self.assertEquals(RevisionSpec('revno:1:a/').in_history(None),
53
 
                          (1, 'a@r-0-1'))
54
 
        self.assertEquals(RevisionSpec('revno:1:a/').in_history(bb),
55
 
                          (1, 'a@r-0-1'))
56
 
        self.assertEquals(RevisionSpec('revno:2:b/').in_history(None),
57
 
                          (2, 'b@r-0-2'))
58
 
 
59
 
 
60
 
    def test_revision_namespaces(self):
61
 
        """Test revision specifiers.
62
 
 
63
 
        These identify revisions by date, etc."""
64
 
        wt = self.make_branch_and_tree('.')
65
 
        b = wt.branch
66
 
 
67
 
        wt.commit('Commit one', rev_id='a@r-0-1', timestamp=time.time() - 60*60*24)
68
 
        wt.commit('Commit two', rev_id='a@r-0-2')
69
 
        wt.commit('Commit three', rev_id='a@r-0-3')
70
 
 
71
 
        self.assertEquals(RevisionSpec(None).in_history(b), (0, None))
72
 
        self.assertEquals(RevisionSpec(1).in_history(b), (1, 'a@r-0-1'))
73
 
        self.assertEquals(RevisionSpec('revno:1').in_history(b),
74
 
                          (1, 'a@r-0-1'))
75
 
        self.assertEquals(RevisionSpec('revid:a@r-0-1').in_history(b),
76
 
                          (1, 'a@r-0-1'))
77
 
        self.assertRaises(NoSuchRevision,
78
 
                          RevisionSpec('revid:a@r-0-0').in_history, b)
79
 
        self.assertRaises(TypeError, RevisionSpec, object)
80
 
 
81
 
        self.assertEquals(RevisionSpec('date:today').in_history(b),
82
 
                          (2, 'a@r-0-2'))
83
 
        self.assertRaises(NoSuchRevision,
84
 
                          RevisionSpec('date:tomorrow').in_history, b)
85
 
        self.assertEquals(RevisionSpec('date:yesterday').in_history(b),
86
 
                          (1, 'a@r-0-1'))
87
 
        self.assertEquals(RevisionSpec('before:date:today').in_history(b),
88
 
                          (1, 'a@r-0-1'))
89
 
 
90
 
        self.assertEquals(RevisionSpec('last:1').in_history(b),
91
 
                          (3, 'a@r-0-3'))
92
 
        self.assertEquals(RevisionSpec('-1').in_history(b), (3, 'a@r-0-3'))
93
 
#        self.assertEquals(b.get_revision_info('last:1'), (3, 'a@r-0-3'))
94
 
#        self.assertEquals(b.get_revision_info('-1'), (3, 'a@r-0-3'))
95
 
 
96
 
        self.assertEquals(RevisionSpec('ancestor:.').in_history(b).rev_id,
97
 
                          'a@r-0-3')
98
 
 
99
 
        os.mkdir('newbranch')
100
 
        wt2 = self.make_branch_and_tree('newbranch')
101
 
        b2 = wt2.branch
102
 
        self.assertRaises(NoCommits, RevisionSpec('ancestor:.').in_history, b2)
103
 
 
104
 
        d3 = b.bzrdir.sprout('copy')
105
 
        b3 = d3.open_branch()
106
 
        wt3 = d3.open_workingtree()
107
 
        wt3.commit('Commit four', rev_id='b@r-0-4')
108
 
        self.assertEquals(RevisionSpec('ancestor:.').in_history(b3).rev_id,
109
 
                          'a@r-0-3')
110
 
        merge(['copy', -1], [None, None])
111
 
        wt.commit('Commit five', rev_id='a@r-0-4')
112
 
        self.assertEquals(RevisionSpec('ancestor:copy').in_history(b).rev_id,
113
 
                          'b@r-0-4')
114
 
        self.assertEquals(RevisionSpec('ancestor:.').in_history(b3).rev_id,
115
 
                          'b@r-0-4')
116
 
 
117
 
        # This should be in the revision store, but not in revision-history
118
 
        self.assertEquals((None, 'b@r-0-4'),
119
 
                RevisionSpec('revid:b@r-0-4').in_history(b))
120
 
 
121
 
    def test_branch_namespace(self):
122
 
        """Ensure that the branch namespace pulls in the requisite content."""
123
 
        self.build_tree(['branch1/', 'branch1/file', 'branch2/'])
124
 
        wt = self.make_branch_and_tree('branch1')
125
 
        branch = wt.branch
126
 
        wt.add(['file'])
127
 
        wt.commit('add file')
128
 
        d2 = branch.bzrdir.sprout('branch2')
129
 
        print >> open('branch2/file', 'w'), 'new content'
130
 
        branch2 = d2.open_branch()
131
 
        d2.open_workingtree().commit('update file', rev_id='A')
132
 
        spec = RevisionSpec('branch:./branch2/.bzr/../')
133
 
        rev_info = spec.in_history(branch)
134
 
        self.assertEqual(rev_info, (None, 'A'))
135
 
 
 
17
 
 
18
from bzrlib.selftest import InTempDir, TestBase
 
19
 
 
20
class TestRevisionNamespaces(InTempDir):
 
21
    """Functional tests for hashcache"""
 
22
    def runTest(self):
 
23
        from bzrlib.errors import BzrError
 
24
        from bzrlib.branch import Branch
 
25
        import os
 
26
        import time
 
27
 
 
28
        b = Branch('.', init=True)
 
29
 
 
30
        b.commit('Commit one', rev_id='a@r-0-1')
 
31
        b.commit('Commit two', rev_id='a@r-0-2')
 
32
        b.commit('Commit three', rev_id='a@r-0-3')
 
33
 
 
34
        self.assertEquals(b.get_revision_info(1), (1, 'a@r-0-1'))
 
35
        self.assertEquals(b.get_revision_info('revno:1'), (1, 'a@r-0-1'))
 
36
        self.assertEquals(b.get_revision_info('revid:a@r-0-1'), (1, 'a@r-0-1'))
 
37
        self.assertRaises(BzrError, b.get_revision_info, 'revid:a@r-0-0')
 
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
 
 
44
TEST_CLASSES = [
 
45
    TestRevisionNamespaces
 
46
    ]