~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Robert Collins
  • Date: 2007-03-02 04:40:12 UTC
  • mto: (2255.11.3 dirstate)
  • mto: This revision was merged to the branch mainline in revision 2322.
  • Revision ID: robertc@robertcollins.net-20070302044012-otqrdw1uhxrw3ar7
Move unknown detection in long status into the delta creation, saving a tree-scan.

Show diffs side-by-side

added added

removed removed

Lines of Context:
294
294
        tree2.add(['a', 'c'], ['a-id', 'c-id'])
295
295
 
296
296
        tree1, tree2 = self.mutable_trees_to_test_trees(tree1, tree2)
297
 
        d = self.intertree_class(tree1, tree2).compare(want_unversioned=True)
 
297
        d = self.intertree_class(tree1, tree2).compare()
298
298
        self.assertEqual([], d.added)
299
299
        self.assertEqual([(u'a', 'a-id', 'file', True, False),
300
300
            (u'c', 'c-id', 'file', True, False)], d.modified)
319
319
        self.assertEqual([], d.removed)
320
320
        self.assertEqual([], d.renamed)
321
321
        self.assertEqual([], d.unchanged)
322
 
        self.assertEqual([(u'dir', 'directory'), (u'file', 'file'),
323
 
            (u'link', 'symlink')], d.unversioned)
 
322
        self.assertEqual([(u'dir', None, 'directory'), (u'file', None, 'file'),
 
323
            (u'link', None, 'symlink')], d.unversioned)
324
324
 
325
325
 
326
326
class TestIterChanges(TestCaseWithTwoTrees):