← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_revisionnamespaces.py

  • Committer: Martin Pool
  • Date: 2006-05-23 10:57:02 UTC
  • mfrom: (1725 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1726.
  • Revision ID: mbp@sourcefrog.net-20060523105702-e5de4664cfdb4e8d
[merge] bzr.dev

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
 
18
import time
 
19
 
 
20
from bzrlib.builtins import merge
 
21
from bzrlib.branch import Branch
 
22
from bzrlib.tests import TestCaseWithTransport
19
23
from bzrlib.errors import NoCommonAncestor, NoCommits
20
 
from bzrlib.branch import copy_branch
21
 
from bzrlib.merge import merge
22
 
 
23
 
class TestRevisionNamespaces(TestCaseInTempDir):
 
24
from bzrlib.errors import NoSuchRevision
 
25
from bzrlib.revisionspec import RevisionSpec
 
26
 
 
27
 
 
28
class TestRevisionNamespaces(TestCaseWithTransport):
 
29
 
24
30
    def test_revision_namespaces(self):
25
 
        """Functional tests for hashcache"""
26
 
        from bzrlib.errors import NoSuchRevision
27
 
        from bzrlib.branch import Branch
28
 
 
29
 
        b = Branch('.', init=True)
30
 
 
31
 
        b.commit('Commit one', rev_id='a@r-0-1')
32
 
        b.commit('Commit two', rev_id='a@r-0-2')
33
 
        b.commit('Commit three', rev_id='a@r-0-3')
34
 
 
35
 
        self.assertEquals(b.get_revision_info(None), (0, None))
36
 
        self.assertEquals(b.get_revision_info(1), (1, 'a@r-0-1'))
37
 
        self.assertEquals(b.get_revision_info('revno:1'), (1, 'a@r-0-1'))
38
 
        self.assertEquals(b.get_revision_info('revid:a@r-0-1'), (1, 'a@r-0-1'))
39
 
        self.assertRaises(NoSuchRevision, b.get_revision_info, 'revid:a@r-0-0')
40
 
        self.assertRaises(TypeError, b.get_revision_info, object)
41
 
 
42
 
        self.assertEquals(b.get_revision_info('date:-tomorrow'), (3, 'a@r-0-3'))
43
 
        self.assertEquals(b.get_revision_info('date:+today'), (1, 'a@r-0-1'))
44
 
 
45
 
        self.assertEquals(b.get_revision_info('last:1'), (3, 'a@r-0-3'))
46
 
        self.assertEquals(b.get_revision_info('-1'), (3, 'a@r-0-3'))
 
31
        """Test revision specifiers.
 
32
 
 
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')
 
40
 
 
41
        self.assertEquals(RevisionSpec(None).in_history(b), (0, None))
 
42
        self.assertEquals(RevisionSpec(1).in_history(b), (1, 'a@r-0-1'))
 
43
        self.assertEquals(RevisionSpec('revno:1').in_history(b),
 
44
                          (1, 'a@r-0-1'))
 
45
        self.assertEquals(RevisionSpec('revid:a@r-0-1').in_history(b),
 
46
                          (1, 'a@r-0-1'))
 
47
        self.assertRaises(NoSuchRevision,
 
48
                          RevisionSpec('revid:a@r-0-0').in_history, b)
 
49
        self.assertRaises(TypeError, RevisionSpec, object)
 
50
 
 
51
        self.assertEquals(RevisionSpec('date:today').in_history(b),
 
52
                          (2, 'a@r-0-2'))
 
53
        self.assertRaises(NoSuchRevision,
 
54
                          RevisionSpec('date:tomorrow').in_history, b)
 
55
        self.assertEquals(RevisionSpec('date:yesterday').in_history(b),
 
56
                          (1, 'a@r-0-1'))
 
57
        self.assertEquals(RevisionSpec('before:date:today').in_history(b),
 
58
                          (1, 'a@r-0-1'))
 
59
        self.assertRaises(NoSuchRevision,
 
60
                          RevisionSpec('date:tomorrow').in_history, b)
 
61
 
 
62
        self.assertEquals(RevisionSpec('last:1').in_history(b),
 
63
                          (3, 'a@r-0-3'))
 
64
        self.assertEquals(RevisionSpec('-1').in_history(b), (3, 'a@r-0-3'))
 
65
#        self.assertEquals(b.get_revision_info('last:1'), (3, 'a@r-0-3'))
 
66
#        self.assertEquals(b.get_revision_info('-1'), (3, 'a@r-0-3'))
 
67
 
 
68
        self.assertEquals(RevisionSpec('ancestor:.').in_history(b).rev_id,
 
69
                          'a@r-0-3')
47
70
 
48
71
        os.mkdir('newbranch')
49
 
        b2 = Branch('newbranch', init=True)
50
 
        self.assertEquals(b2.lookup_revision('revid:a@r-0-1'), 'a@r-0-1')
 
72
        wt2 = self.make_branch_and_tree('newbranch')
 
73
        b2 = wt2.branch
 
74
        self.assertRaises(NoCommits, RevisionSpec('ancestor:.').in_history, b2)
51
75
 
52
 
        self.assertRaises(NoCommits, b2.lookup_revision, 'ancestor:.')
53
 
        self.assertEquals(b.lookup_revision('ancestor:.'), 'a@r-0-3')
54
 
        os.mkdir('copy')
55
 
        b3 = copy_branch(b, 'copy')
56
 
        b3.commit('Commit four', rev_id='b@r-0-4')
57
 
        self.assertEquals(b3.lookup_revision('ancestor:.'), 'a@r-0-3')
 
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')
 
80
        self.assertEquals(RevisionSpec('ancestor:.').in_history(b3).rev_id,
 
81
                          'a@r-0-3')
58
82
        merge(['copy', -1], [None, None])
59
 
        b.commit('Commit five', rev_id='a@r-0-4')
60
 
        self.assertEquals(b.lookup_revision('ancestor:copy'), 'b@r-0-4')
61
 
        self.assertEquals(b3.lookup_revision('ancestor:.'), 'b@r-0-4')
 
83
        wt.commit('Commit five', rev_id='a@r-0-4')
 
84
        self.assertEquals(RevisionSpec('ancestor:copy').in_history(b).rev_id,
 
85
                          'b@r-0-4')
 
86
        self.assertEquals(RevisionSpec('ancestor:.').in_history(b3).rev_id,
 
87
                          'b@r-0-4')
 
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
 
 
93
    def test_branch_namespace(self):
 
94
        """Ensure that the branch namespace pulls in the requisite content."""
 
95
        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')
 
101
        print >> open('branch2/file', 'w'), 'new content'
 
102
        branch2 = d2.open_branch()
 
103
        d2.open_workingtree().commit('update file', rev_id='A')
 
104
        spec = RevisionSpec('branch:./branch2/.bzr/../')
 
105
        rev_info = spec.in_history(branch)
 
106
        self.assertEqual(rev_info, (None, 'A'))
 
107