← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_workingtree_4.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-03-10 23:39:45 UTC
  • mfrom: (3254.1.4 public-iter-changes)
  • Revision ID: pqm@pqm.ubuntu.com-20080310233945-ed3k1rc4g1p9qcpj
Make Tree.iter_changes a public method (abentley)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_workingtree_4.py
496
496
            (None, u'dir'),
497
497
            (None, 'directory'),
498
498
            (None, False))]
499
 
        self.assertEqual(expected, list(tree._iter_changes(tree.basis_tree(),
 
499
        self.assertEqual(expected, list(tree.iter_changes(tree.basis_tree(),
500
500
            specific_files=['dir'])))
501
501
        tree.unlock()
502
502
        # do a commit, we want to trigger the dirstate fast-path too
514
514
            ('dir', 'dir'),
515
515
            ('directory', None),
516
516
            (False, False))]
517
 
        self.assertEqual(expected, list(tree._iter_changes(tree.basis_tree())))
 
517
        self.assertEqual(expected, list(tree.iter_changes(tree.basis_tree())))
518
518
        tree.unlock()
519
519
 
520
520
    def test_with_subtree_supports_tree_references(self):
526
526
        # workingtree_4.
527
527
 
528
528
    def test_iter_changes_ignores_unversioned_dirs(self):
529
 
        """_iter_changes should not descend into unversioned directories."""
 
529
        """iter_changes should not descend into unversioned directories."""
530
530
        tree = self.make_branch_and_tree('.', format='dirstate')
531
531
        # We have an unversioned directory at the root, a versioned one with
532
532
        # other versioned files and an unversioned directory, and another
564
564
        basis.lock_read()
565
565
        self.addCleanup(basis.unlock)
566
566
        changes = [c[1] for c in
567
 
                   tree._iter_changes(basis, want_unversioned=True)]
 
567
                   tree.iter_changes(basis, want_unversioned=True)]
568
568
        self.assertEqual([(None, 'unversioned'),
569
569
                          (None, 'versioned/unversioned'),
570
570
                          (None, 'versioned2/unversioned'),
571
571
                         ], changes)
572
572
        self.assertEqual(['', 'versioned', 'versioned2'], returned)
573
573
        del returned[:] # reset
574
 
        changes = [c[1] for c in tree._iter_changes(basis)]
 
574
        changes = [c[1] for c in tree.iter_changes(basis)]
575
575
        self.assertEqual([], changes)
576
576
        self.assertEqual(['', 'versioned', 'versioned2'], returned)
577
577
 
599
599
                                            [('f', '', 0, False, ''),
600
600
                                             ('r', 'bar', 0 , False, '')]))
601
601
            self.assertListRaises(errors.CorruptDirstate,
602
 
                                  tree._iter_changes, tree.basis_tree())
 
602
                                  tree.iter_changes, tree.basis_tree())
603
603
        finally:
604
604
            tree.unlock()
605
605