← 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-16 03:32:44 UTC
  • mfrom: (1185.1.23)
  • mto: (1185.8.2) (974.1.91)
  • mto: This revision was merged to the branch mainline in revision 1390.
  • Revision ID: mbp@sourcefrog.net-20050916033244-18c4f4bcba663e42
- merge in many integration fixes from Robert

  * xml escaping of unprintable characters

  * 'make clean'

  * new, more consistent Branch constructors 

  * RemoteBranch tests against local farmework

  * scott's non-verbose commit fix 

This seems to break this usage though 

  bzr diff -r 1207..1208 ../bzr.robertc-integration

robertc@robertcollins.net-20050915175953-a16fdc627ce7c541

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testrevisionnamespaces.py
16
16
 
17
17
import os
18
18
from bzrlib.selftest import TestCaseInTempDir
 
19
from bzrlib.errors import NoCommonAncestor, NoCommits
 
20
from bzrlib.branch import copy_branch
 
21
from bzrlib.merge import merge
19
22
 
20
23
class TestRevisionNamespaces(TestCaseInTempDir):
21
24
    def test_revision_namespaces(self):
22
25
        """Functional tests for hashcache"""
23
26
        from bzrlib.errors import NoSuchRevision
24
27
        from bzrlib.branch import Branch
 
28
        from bzrlib.revisionspec import RevisionSpec
25
29
 
26
 
        b = Branch('.', init=True)
 
30
        b = Branch.initialize('.')
27
31
 
28
32
        b.commit('Commit one', rev_id='a@r-0-1')
29
33
        b.commit('Commit two', rev_id='a@r-0-2')
30
34
        b.commit('Commit three', rev_id='a@r-0-3')
31
35
 
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'))
 
36
        self.assertEquals(RevisionSpec(None).in_history(b), (0, None))
 
37
        self.assertEquals(RevisionSpec(1).in_history(b), (1, 'a@r-0-1'))
 
38
        self.assertEquals(RevisionSpec('revno:1').in_history(b),
 
39
                          (1, 'a@r-0-1'))
 
40
        self.assertEquals(RevisionSpec('revid:a@r-0-1').in_history(b),
 
41
                          (1, 'a@r-0-1'))
 
42
        self.assertRaises(NoSuchRevision,
 
43
                          RevisionSpec('revid:a@r-0-0').in_history, b)
 
44
        self.assertRaises(TypeError, RevisionSpec, object)
 
45
 
 
46
        self.assertEquals(RevisionSpec('date:-tomorrow').in_history(b),
 
47
                          (3, 'a@r-0-3'))
 
48
        self.assertEquals(RevisionSpec('date:+today').in_history(b),
 
49
                          (1, 'a@r-0-1'))
 
50
 
 
51
        self.assertEquals(RevisionSpec('last:1').in_history(b),
 
52
                          (3, 'a@r-0-3'))
 
53
        self.assertEquals(RevisionSpec('-1').in_history(b), (3, 'a@r-0-3'))
 
54
#        self.assertEquals(b.get_revision_info('last:1'), (3, 'a@r-0-3'))
 
55
#        self.assertEquals(b.get_revision_info('-1'), (3, 'a@r-0-3'))
 
56
 
 
57
        self.assertEquals(RevisionSpec('ancestor:.').in_history(b).rev_id,
 
58
                          'a@r-0-3')
44
59
 
45
60
        os.mkdir('newbranch')
46
 
        b2 = Branch('newbranch', init=True)
47
 
        self.assertEquals(b2.lookup_revision('revid:a@r-0-1'), 'a@r-0-1')
 
61
        b2 = Branch.initialize('newbranch')
 
62
        self.assertRaises(NoCommits, RevisionSpec('ancestor:.').in_history, b2)
 
63
 
 
64
        os.mkdir('copy')
 
65
        b3 = copy_branch(b, 'copy')
 
66
        b3.commit('Commit four', rev_id='b@r-0-4')
 
67
        self.assertEquals(RevisionSpec('ancestor:.').in_history(b3).rev_id,
 
68
                          'a@r-0-3')
 
69
        merge(['copy', -1], [None, None])
 
70
        b.commit('Commit five', rev_id='a@r-0-4')
 
71
        self.assertEquals(RevisionSpec('ancestor:copy').in_history(b).rev_id,
 
72
                          'b@r-0-4')
 
73
        self.assertEquals(RevisionSpec('ancestor:.').in_history(b3).rev_id,
 
74
                          'b@r-0-4')