~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

Implement a proper InterCHKRevisionTree.iter_changes and some other cleanups

Show diffs side-by-side

added added

removed removed

Lines of Context:
132
132
        (InterTree.__name__, InterTree, default_tree_format, default_tree_format,
133
133
         return_provided_trees)]
134
134
    for optimiser in InterTree._optimisers:
135
 
        if optimiser is bzrlib.workingtree_4.InterDirStateTree:
 
135
        if optimiser is revisiontree.InterCHKRevisionTree:
 
136
            # XXX: we shouldn't use an Intertree object to detect inventories
 
137
            # -- vila 20090311
 
138
            continue
 
139
        elif optimiser is bzrlib.workingtree_4.InterDirStateTree:
136
140
            # Its a little ugly to be conditional here, but less so than having
137
141
            # the optimiser listed twice.
138
142
            # Add once, compiled version