← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

  • Committer: Robert Collins
  • Date: 2009-12-22 23:09:50 UTC
  • mfrom: (4918 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4920.
  • Revision ID: robertc@robertcollins.net-20091222230950-39gjmost0lmu9ufg
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
1974
1974
        return result
1975
1975
 
1976
1976
    @classmethod
1977
 
    def make_source_parent_tree_compiled_dirstate(klass, test_case, source, target):
 
1977
    def make_source_parent_tree_compiled_dirstate(klass, test_case, source,
 
1978
                                                  target):
1978
1979
        from bzrlib.tests.test__dirstate_helpers import \
1979
 
            CompiledDirstateHelpersFeature
1980
 
        if not CompiledDirstateHelpersFeature.available():
1981
 
            from bzrlib.tests import UnavailableFeature
1982
 
            raise UnavailableFeature(CompiledDirstateHelpersFeature)
 
1980
            compiled_dirstate_helpers_feature
 
1981
        test_case.requireFeature(compiled_dirstate_helpers_feature)
1983
1982
        from bzrlib._dirstate_helpers_pyx import ProcessEntryC
1984
1983
        result = klass.make_source_parent_tree(source, target)
1985
1984
        result[1]._iter_changes = ProcessEntryC