← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testrevisionnamespaces.py

  • Committer: Robert Collins
  • Date: 2005-08-25 10:04:51 UTC
  • mto: (974.1.50) (1185.1.10) (1092.3.1)
  • mto: This revision was merged to the branch mainline in revision 1139.
  • Revision ID: robertc@robertcollins.net-20050825100451-b01297285491ba46
make a default merge choose a sane base with branch.common_ancestor

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testrevisionnamespaces.py
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
 
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
22
 
 
23
 
class TestRevisionNamespaces(TestCaseInTempDir):
24
 
 
 
17
 
 
18
from bzrlib.selftest import InTempDir
 
19
 
 
20
class TestRevisionNamespaces(InTempDir):
25
21
    def test_revision_namespaces(self):
26
 
        """Test revision specifiers.
27
 
 
28
 
        These identify revisions by date, etc."""
29
 
        from bzrlib.errors import NoSuchRevision
 
22
        """Functional tests for hashcache"""
 
23
        from bzrlib.errors import BzrError
30
24
        from bzrlib.branch import Branch
31
 
        from bzrlib.revisionspec import RevisionSpec
 
25
        import os
 
26
        import time
32
27
 
33
 
        b = Branch.initialize('.')
 
28
        b = Branch('.', init=True)
34
29
 
35
30
        b.commit('Commit one', rev_id='a@r-0-1')
36
31
        b.commit('Commit two', rev_id='a@r-0-2')
37
32
        b.commit('Commit three', rev_id='a@r-0-3')
38
33
 
39
 
        self.assertEquals(RevisionSpec(None).in_history(b), (0, None))
40
 
        self.assertEquals(RevisionSpec(1).in_history(b), (1, 'a@r-0-1'))
41
 
        self.assertEquals(RevisionSpec('revno:1').in_history(b),
42
 
                          (1, 'a@r-0-1'))
43
 
        self.assertEquals(RevisionSpec('revid:a@r-0-1').in_history(b),
44
 
                          (1, 'a@r-0-1'))
45
 
        self.assertRaises(NoSuchRevision,
46
 
                          RevisionSpec('revid:a@r-0-0').in_history, b)
47
 
        self.assertRaises(TypeError, RevisionSpec, object)
48
 
 
49
 
        self.assertEquals(RevisionSpec('date:-tomorrow').in_history(b),
50
 
                          (3, 'a@r-0-3'))
51
 
        self.assertEquals(RevisionSpec('date:+today').in_history(b),
52
 
                          (1, 'a@r-0-1'))
53
 
 
54
 
        self.assertEquals(RevisionSpec('last:1').in_history(b),
55
 
                          (3, 'a@r-0-3'))
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')
 
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'))