← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
1806
1806
        return target.basis_tree(), target
1807
1807
 
1808
1808
    @classmethod
1809
 
    def make_source_parent_tree_python_dirstate(klass, source, target):
 
1809
    def make_source_parent_tree_python_dirstate(klass, test_case, source, target):
1810
1810
        result = klass.make_source_parent_tree(source, target)
1811
1811
        result[1]._iter_changes = dirstate.ProcessEntryPython
1812
1812
        return result
1813
1813
 
1814
1814
    @classmethod
1815
 
    def make_source_parent_tree_compiled_dirstate(klass, source, target):
 
1815
    def make_source_parent_tree_compiled_dirstate(klass, test_case, source, target):
1816
1816
        from bzrlib.tests.test__dirstate_helpers import \
1817
1817
            CompiledDirstateHelpersFeature
1818
1818
        if not CompiledDirstateHelpersFeature.available():
1825
1825
 
1826
1826
    _matching_from_tree_format = WorkingTreeFormat4()
1827
1827
    _matching_to_tree_format = WorkingTreeFormat4()
1828
 
    _test_mutable_trees_to_test_trees = make_source_parent_tree
 
1828
 
 
1829
    @classmethod
 
1830
    def _test_mutable_trees_to_test_trees(klass, test_case, source, target):
 
1831
        # This method shouldn't be called, because we have python and C
 
1832
        # specific flavours.
 
1833
        raise NotImplementedError
1829
1834
 
1830
1835
    def iter_changes(self, include_unchanged=False,
1831
1836
                      specific_files=None, pb=None, extra_trees=[],