← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_revision.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-11-30 22:56:29 UTC
  • mfrom: (3052.1.7 is_ancestor_fix)
  • Revision ID: pqm@pqm.ubuntu.com-20071130225629-sovkf7a4lksj1z4g
(John Arbash Meinel) deprecate bzrlib.revision.is_ancestor,
        and special case Graph.is_ancestor for NULL_REVISION

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_revision.py
28
28
                             common_ancestor,
29
29
                             is_ancestor, MultipleRevisionSources,
30
30
                             NULL_REVISION)
 
31
from bzrlib.symbol_versioning import zero_ninetythree
31
32
from bzrlib.tests import TestCase, TestCaseWithTransport
32
33
from bzrlib.trace import mutter
33
34
from bzrlib.workingtree import WorkingTree
132
133
        revisions_2 = br2.revision_history()
133
134
        sources = br1
134
135
 
135
 
        self.assert_(is_ancestor(revisions[0], revisions[0], br1))
136
 
        self.assert_(is_ancestor(revisions[1], revisions[0], sources))
137
 
        self.assert_(not is_ancestor(revisions[0], revisions[1], sources))
138
 
        self.assert_(is_ancestor(revisions_2[3], revisions[0], sources))
 
136
        br1.lock_read()
 
137
        self.addCleanup(br1.unlock)
 
138
        br2.lock_read()
 
139
        self.addCleanup(br2.unlock)
 
140
 
 
141
        self.assertTrue(self.applyDeprecated(zero_ninetythree,
 
142
                        is_ancestor, revisions[0], revisions[0], br1))
 
143
        self.assertTrue(self.applyDeprecated(zero_ninetythree,
 
144
                        is_ancestor, revisions[1], revisions[0], sources))
 
145
        self.assertFalse(self.applyDeprecated(zero_ninetythree,
 
146
                         is_ancestor, revisions[0], revisions[1], sources))
 
147
        self.assertTrue(self.applyDeprecated(zero_ninetythree,
 
148
                        is_ancestor, revisions_2[3], revisions[0], sources))
139
149
        # disabled mbp 20050914, doesn't seem to happen anymore
140
150
        ## self.assertRaises(NoSuchRevision, is_ancestor, revisions_2[3],
141
151
        ##                  revisions[0], br1)        
142
 
        self.assert_(is_ancestor(revisions[3], revisions_2[4], sources))
143
 
        self.assert_(is_ancestor(revisions[3], revisions_2[4], br1))
144
 
        self.assert_(is_ancestor(revisions[3], revisions_2[3], sources))
 
152
        self.assertTrue(self.applyDeprecated(zero_ninetythree,
 
153
                        is_ancestor, revisions[3], revisions_2[4], sources))
 
154
        self.assertTrue(self.applyDeprecated(zero_ninetythree,
 
155
                        is_ancestor, revisions[3], revisions_2[4], br1))
 
156
        self.assertTrue(self.applyDeprecated(zero_ninetythree,
 
157
                        is_ancestor, revisions[3], revisions_2[3], sources))
145
158
        ## self.assert_(not is_ancestor(revisions[3], revisions_2[3], br1))
146
159
 
147
160