← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-12-07 02:59:58 UTC
  • mfrom: (4826.1.8 hardlink-2a-408193)
  • Revision ID: pqm@pqm.ubuntu.com-20091207025958-wrddjbe59f5mjgva
(andrew) Allow '--hardlink' of files from 2a trees for any file that
        is unfiltered. (#408193)

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