← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_transform.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-12-02 14:58:47 UTC
  • mfrom: (5554.1.3 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20101202145847-fw822sd3nyhvrwmi
(vila) Merge 2.2 into trunk including fix for bug #583667 and bug
        #681885 (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_transform.py
2381
2381
                  ('TREE_ROOT', 'TREE_ROOT'), ('a', 'a'), ('file', 'file'),
2382
2382
                  (False, False))
2383
2383
ROOT_ENTRY = ('TREE_ROOT', ('', ''), False, (True, True), (None, None),
2384
 
              ('', ''), ('directory', 'directory'), (False, None))
 
2384
              ('', ''), ('directory', 'directory'), (False, False))
2385
2385
 
2386
2386
 
2387
2387
class TestTransformPreview(tests.TestCaseWithTransport):
2474
2474
        revision_tree, preview_tree = self.get_tree_and_preview_tree()
2475
2475
        changes = preview_tree.iter_changes(revision_tree,
2476
2476
                                            specific_files=[''])
2477
 
        self.assertEqual([ROOT_ENTRY, A_ENTRY], list(changes))
 
2477
        self.assertEqual([A_ENTRY], list(changes))
2478
2478
 
2479
2479
    def test_want_unversioned(self):
2480
2480
        revision_tree, preview_tree = self.get_tree_and_preview_tree()
2481
2481
        changes = preview_tree.iter_changes(revision_tree,
2482
2482
                                            want_unversioned=True)
2483
 
        self.assertEqual([ROOT_ENTRY, A_ENTRY], list(changes))
 
2483
        self.assertEqual([A_ENTRY], list(changes))
2484
2484
 
2485
2485
    def test_ignore_extra_trees_no_specific_files(self):
2486
2486
        # extra_trees is harmless without specific_files, so we'll silently