← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testrevisionnamespaces.py

merge merge tweaks from aaron, which includes latest .dev

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):
 
24
 
21
25
    def test_revision_namespaces(self):
22
 
        """Functional tests for hashcache"""
 
26
        """Test revision specifiers.
 
27
 
 
28
        These identify revisions by date, etc."""
23
29
        from bzrlib.errors import NoSuchRevision
24
30
        from bzrlib.branch import Branch
25
31
        from bzrlib.revisionspec import RevisionSpec
48
54
        self.assertEquals(RevisionSpec('last:1').in_history(b),
49
55
                          (3, 'a@r-0-3'))
50
56
        self.assertEquals(RevisionSpec('-1').in_history(b), (3, 'a@r-0-3'))
 
57
#        self.assertEquals(b.get_revision_info('last:1'), (3, 'a@r-0-3'))
 
58
#        self.assertEquals(b.get_revision_info('-1'), (3, 'a@r-0-3'))
 
59
 
 
60
        self.assertEquals(RevisionSpec('ancestor:.').in_history(b).rev_id,
 
61
                          'a@r-0-3')
 
62
 
 
63
        os.mkdir('newbranch')
 
64
        b2 = Branch.initialize('newbranch')
 
65
        self.assertRaises(NoCommits, RevisionSpec('ancestor:.').in_history, b2)
 
66
 
 
67
        os.mkdir('copy')
 
68
        b3 = copy_branch(b, 'copy')
 
69
        b3.commit('Commit four', rev_id='b@r-0-4')
 
70
        self.assertEquals(RevisionSpec('ancestor:.').in_history(b3).rev_id,
 
71
                          'a@r-0-3')
 
72
        merge(['copy', -1], [None, None])
 
73
        b.commit('Commit five', rev_id='a@r-0-4')
 
74
        self.assertEquals(RevisionSpec('ancestor:copy').in_history(b).rev_id,
 
75
                          'b@r-0-4')
 
76
        self.assertEquals(RevisionSpec('ancestor:.').in_history(b3).rev_id,
 
77
                          'b@r-0-4')