← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_tree.py

merge dirstate

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_tree.py
62
62
    calls = []
63
63
 
64
64
    def compare(self, want_unchanged=False, specific_files=None,
65
 
        extra_trees=None, require_versioned=False, include_root=False):
 
65
        extra_trees=None, require_versioned=False, include_root=False,
 
66
        want_unversioned=False):
66
67
        self.calls.append(
67
68
            ('compare', self.source, self.target, want_unchanged,
68
69
             specific_files, extra_trees, require_versioned, 
69
 
             include_root)
 
70
             include_root, want_unversioned)
70
71
            )
71
72
    
72
73
    @classmethod
98
99
                extra_trees='extra',
99
100
                require_versioned='require',
100
101
                include_root=True,
 
102
                want_unversioned=True,
101
103
                )
102
104
        finally:
103
105
            InterTree._optimisers = old_optimisers
104
106
        self.assertEqual(
105
107
            [
106
 
             ('compare', tree2, tree, False, None, None, False, False),
107
 
             ('compare', tree2, tree, 'unchanged', 'specific', 'extra',
108
 
              'require', True),
109
 
             ('compare', tree2, tree, 'unchanged', 'specific', 'extra',
110
 
              'require', True),
 
108
             ('compare', tree2, tree, False, None, None, False, False, False),
 
109
             ('compare', tree2, tree, 'unchanged', 'specific', 'extra',
 
110
              'require', True, False),
 
111
             ('compare', tree2, tree, 'unchanged', 'specific', 'extra',
 
112
              'require', True, True),
111
113
            ], RecordingOptimiser.calls)
112
114
 
113
115
    def test_changes_from_with_root(self):