/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-01-14 00:01:32 UTC
  • mfrom: (4957.1.1 jam-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20100114000132-3p3rabnonjw3gzqb
(jam) Merge bzr.stable, bringing in bug fixes #175839, #504390

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
1447
1447
                if basis_root_id is not None:
1448
1448
                    wt._set_root_id(basis_root_id)
1449
1449
                    wt.flush()
1450
 
                # If content filtering is supported, do not use the accelerator
1451
 
                # tree - the cost of transforming the content both ways and
1452
 
                # checking for changed content can outweight the gains it gives.
1453
 
                # Note: do NOT move this logic up higher - using the basis from
1454
 
                # the accelerator tree is still desirable because that can save
1455
 
                # a minute or more of processing on large trees!
1456
 
                # The original tree may not have the same content filters
1457
 
                # applied so we can't safely build the inventory delta from
1458
 
                # the source tree.
1459
1450
                if wt.supports_content_filtering():
1460
 
                    if hardlink:
1461
 
                        # see https://bugs.edge.launchpad.net/bzr/+bug/408193
1462
 
                        trace.warning("hardlinking working copy files is not currently "
1463
 
                            "supported in %r" % (wt,))
1464
 
                    accelerator_tree = None
 
1451
                    # The original tree may not have the same content filters
 
1452
                    # applied so we can't safely build the inventory delta from
 
1453
                    # the source tree.
1465
1454
                    delta_from_tree = False
1466
1455
                else:
1467
1456
                    delta_from_tree = True
1985
1974
        return result
1986
1975
 
1987
1976
    @classmethod
1988
 
    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):
1989
1979
        from bzrlib.tests.test__dirstate_helpers import \
1990
 
            CompiledDirstateHelpersFeature
1991
 
        if not CompiledDirstateHelpersFeature.available():
1992
 
            from bzrlib.tests import UnavailableFeature
1993
 
            raise UnavailableFeature(CompiledDirstateHelpersFeature)
 
1980
            compiled_dirstate_helpers_feature
 
1981
        test_case.requireFeature(compiled_dirstate_helpers_feature)
1994
1982
        from bzrlib._dirstate_helpers_pyx import ProcessEntryC
1995
1983
        result = klass.make_source_parent_tree(source, target)
1996
1984
        result[1]._iter_changes = ProcessEntryC
2027
2015
            output. An unversioned file is defined as one with (False, False)
2028
2016
            for the versioned pair.
2029
2017
        """
2030
 
        # NB: show_status depends on being able to pass in non-versioned files
2031
 
        # and report them as unknown
2032
2018
        # TODO: handle extra trees in the dirstate.
2033
2019
        if (extra_trees or specific_files == []):
2034
2020
            # we can't fast-path these cases (yet)