← 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-06-11 05:22:11 UTC
  • mfrom: (4427.1.2 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20090611052211-b6b2pu471mdja7zz
(igc) fix branch & status content filtering issues

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
1440
1440
                # Note: do NOT move this logic up higher - using the basis from
1441
1441
                # the accelerator tree is still desirable because that can save
1442
1442
                # a minute or more of processing on large trees!
 
1443
                # The original tree may not have the same content filters
 
1444
                # applied so we can't safely build the inventory delta from
 
1445
                # the source tree.
1443
1446
                if wt.supports_content_filtering():
1444
1447
                    accelerator_tree = None
 
1448
                    delta_from_tree = False
 
1449
                else:
 
1450
                    delta_from_tree = True
1445
1451
                # delta_from_tree is safe even for DirStateRevisionTrees,
1446
1452
                # because wt4.apply_inventory_delta does not mutate the input
1447
1453
                # inventory entries.
1448
1454
                transform.build_tree(basis, wt, accelerator_tree,
1449
 
                                     hardlink=hardlink, delta_from_tree=True)
 
1455
                                     hardlink=hardlink,
 
1456
                                     delta_from_tree=delta_from_tree)
1450
1457
            finally:
1451
1458
                basis.unlock()
1452
1459
        finally: