Rev 4378: (igc) faster branch in a shared repo for dev6rr format (Ian in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 4378
revision-id: pqm at pqm.ubuntu.com-20090522070510-7axls2bemv3scgpw
parent: pqm at pqm.ubuntu.com-20090522023622-3nmhis99wz3qgg6z
parent: ian.clatworthy at canonical.com-20090522061314-ce3rivyiwnn9flwy
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2009-05-22 08:05:10 +0100
message:
  (igc) faster branch in a shared repo for dev6rr format (Ian
  	Clatworthy)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
    ------------------------------------------------------------
    revno: 4377.2.1
    revision-id: ian.clatworthy at canonical.com-20090522061314-ce3rivyiwnn9flwy
    parent: pqm at pqm.ubuntu.com-20090522023622-3nmhis99wz3qgg6z
    parent: ian.clatworthy at canonical.com-20090522050408-l1gazff72rlalfbg
    committer: Ian Clatworthy <ian.clatworthy at canonical.com>
    branch nick: integration
    timestamp: Fri 2009-05-22 16:13:14 +1000
    message:
      (igc) faster branch in a shared repo for dev6rr format (Ian Clatworthy)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
    ------------------------------------------------------------
    revno: 4377.1.1
    revision-id: ian.clatworthy at canonical.com-20090522050408-l1gazff72rlalfbg
    parent: pqm at pqm.ubuntu.com-20090522023622-3nmhis99wz3qgg6z
    committer: Ian Clatworthy <ian.clatworthy at canonical.com>
    branch nick: faster-branch
    timestamp: Fri 2009-05-22 15:04:08 +1000
    message:
      speed up branch-in-a-shared-repo for development6-rich-root format
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
=== modified file 'NEWS'
--- a/NEWS	2009-05-22 01:44:19 +0000
+++ b/NEWS	2009-05-22 05:04:08 +0000
@@ -18,6 +18,9 @@
 Improvements
 ************
 
+* ``bzr branch`` in a shared repository is now faster for
+  development6-rich-root format. (Ian Clatworthy)
+
 * ``bzr branch --notree`` is now faster. (Ian Clatworthy)
 
 Bug Fixes

=== modified file 'bzrlib/workingtree_4.py'
--- a/bzrlib/workingtree_4.py	2009-05-05 05:39:41 +0000
+++ b/bzrlib/workingtree_4.py	2009-05-22 05:04:08 +0000
@@ -1434,6 +1434,14 @@
                 if basis_root_id is not None:
                     wt._set_root_id(basis_root_id)
                     wt.flush()
+                # If content filtering is supported, do not use the accelerator
+                # tree - the cost of transforming the content both ways and
+                # checking for changed content can outweight the gains it gives.
+                # Note: do NOT move this logic up higher - using the basis from
+                # the accelerator tree is still desirable because that can save
+                # a minute or more of processing on large trees!
+                if wt.supports_content_filtering():
+                    accelerator_tree = None
                 # delta_from_tree is safe even for DirStateRevisionTrees,
                 # because wt4.apply_inventory_delta does not mutate the input
                 # inventory entries.