← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/intertree_implementations/test_compare.py

  • Committer: Alexander Belchenko
  • Date: 2008-03-12 19:55:37 UTC
  • mfrom: (3267 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3268.
  • Revision ID: bialix@ukr.net-20080312195537-pwgebmgki3p4zjbg
merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/intertree_implementations/test_compare.py
344
344
    """Test the comparison iterator"""
345
345
 
346
346
    def do_iter_changes(self, tree1, tree2, **extra_args):
347
 
        """Helper to run _iter_changes from tree1 to tree2.
 
347
        """Helper to run iter_changes from tree1 to tree2.
348
348
        
349
349
        :param tree1, tree2:  The source and target trees. These will be locked
350
350
            automatically.
351
 
        :param **extra_args: Extra args to pass to _iter_changes. This is not
 
351
        :param **extra_args: Extra args to pass to iter_changes. This is not
352
352
            inspected by this test helper.
353
353
        """
354
354
        tree1.lock_read()
356
356
        try:
357
357
            # sort order of output is not strictly defined
358
358
            return sorted(self.intertree_class(tree1, tree2)
359
 
                ._iter_changes(**extra_args))
 
359
                .iter_changes(**extra_args))
360
360
        finally:
361
361
            tree1.unlock()
362
362
            tree2.unlock()
729
729
        tree2.add_reference(subtree2)
730
730
        tree1, tree2 = self.mutable_trees_to_locked_test_trees(tree1, tree2)
731
731
 
732
 
        self.assertEqual([], list(tree2._iter_changes(tree1)))
 
732
        self.assertEqual([], list(tree2.iter_changes(tree1)))
733
733
        subtree1.commit('commit', rev_id='commit-a')
734
734
        self.assertEqual([
735
735
            ('root-id',
748
748
             ('sub', 'sub'),
749
749
             ('tree-reference', 'tree-reference'),
750
750
             (False, False))],
751
 
                         list(tree2._iter_changes(tree1,
 
751
                         list(tree2.iter_changes(tree1,
752
752
                             include_unchanged=True)))
753
753
 
754
754
    def test_disk_in_subtrees_skipped(self):