← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testrevisionnamespaces.py

  • Committer: Lalo Martins
  • Date: 2005-09-15 15:16:12 UTC
  • mfrom: (1185.1.18)
  • mto: (1185.1.22)
  • mto: This revision was merged to the branch mainline in revision 1390.
  • Revision ID: lalo@exoweb.net-20050915151611-86c5de4298bb71f9
merging from integration again.

This is a "checkpoint" commit; the tests don't actually pass, but all the
really hard stuff has been merged (in particular, Aaron's new ancestor:
namespace was moved to revisionspec).

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):
48
51
        self.assertEquals(RevisionSpec('last:1').in_history(b),
49
52
                          (3, 'a@r-0-3'))
50
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')
 
59
 
 
60
        os.mkdir('newbranch')
 
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')