← 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-09-13 05:22:41 UTC
  • Revision ID: mbp@sourcefrog.net-20050913052241-52dbd8e8ced620f6
- better BZR_DEBUG trace output

Show diffs side-by-side

added added

removed removed

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