← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_tree.py

  • Committer: John Arbash Meinel
  • Date: 2008-06-30 21:32:04 UTC
  • mto: (3697.7.4 1.7)
  • mto: This revision was merged to the branch mainline in revision 3599.
  • Revision ID: john@arbash-meinel.com-20080630213204-w4f20aico7ta1bs1
Handle more cases when the other tree has extra nodes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_tree.py
291
291
        self.assertWalkerNext(u'e', 'b-id', True, [u'b'], iterator)
292
292
        self.assertRaises(StopIteration, iterator.next)
293
293
 
294
 
    def test_other_extra(self):
 
294
    def test_other_extra_in_middle(self):
295
295
        tree = self.make_branch_and_tree('tree')
296
296
        self.build_tree(['tree/a', 'tree/b', 'tree/d'])
297
297
        tree.add(['a', 'b', 'd'], ['a-id', 'b-id', 'd-id'])
306
306
        self.assertWalkerNext(u'd', 'd-id', True, [u'd'], iterator)
307
307
        self.assertWalkerNext(u'b', 'b-id', False, [u'b'], iterator)
308
308
        self.assertRaises(StopIteration, iterator.next)
 
309
 
 
310
    def test_other_extra_at_end(self):
 
311
        tree = self.make_branch_and_tree('tree')
 
312
        self.build_tree(['tree/a', 'tree/b', 'tree/d'])
 
313
        tree.add(['a', 'b', 'd'], ['a-id', 'b-id', 'd-id'])
 
314
        tree.commit('first', rev_id='first-rev-id')
 
315
        tree.remove(['d'])
 
316
 
 
317
        basis_tree, root_id = self.lock_and_get_basis_and_root_id(tree)
 
318
        walker = _mod_tree.MultiWalker(tree, [basis_tree])
 
319
        iterator = walker.iter_all()
 
320
        self.assertWalkerNext(u'', root_id, True, [u''], iterator)
 
321
        self.assertWalkerNext(u'a', 'a-id', True, [u'a'], iterator)
 
322
        self.assertWalkerNext(u'b', 'b-id', True, [u'b'], iterator)
 
323
        self.assertWalkerNext(u'd', 'd-id', False, [u'd'], iterator)
 
324
        self.assertRaises(StopIteration, iterator.next)
 
325