Rev 4377: (igc) make branch --no-tree faster (Ian Clatworthy) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 4377
revision-id: pqm at pqm.ubuntu.com-20090522023622-3nmhis99wz3qgg6z
parent: pqm at pqm.ubuntu.com-20090521145743-3ttnkw77ofepprzq
parent: ian.clatworthy at canonical.com-20090522014419-5rb6dxpuaxhqp207
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2009-05-22 03:36:22 +0100
message:
  (igc) make branch --no-tree faster (Ian Clatworthy)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/revisiontree.py         revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
  bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
    ------------------------------------------------------------
    revno: 4376.1.1
    revision-id: ian.clatworthy at canonical.com-20090522014419-5rb6dxpuaxhqp207
    parent: pqm at pqm.ubuntu.com-20090521145743-3ttnkw77ofepprzq
    parent: ian.clatworthy at canonical.com-20090519002605-elhdzkol01issxys
    committer: Ian Clatworthy <ian.clatworthy at canonical.com>
    branch nick: integration
    timestamp: Fri 2009-05-22 11:44:19 +1000
    message:
      (igc) make branch --no-tree faster (Ian Clatworthy)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/revisiontree.py         revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
      bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
    ------------------------------------------------------------
    revno: 4370.3.4
    revision-id: ian.clatworthy at canonical.com-20090519002605-elhdzkol01issxys
    parent: ian.clatworthy at canonical.com-20090519002448-4cyopda2rpwpn3cm
    committer: Ian Clatworthy <ian.clatworthy at canonical.com>
    branch nick: faster-branch
    timestamp: Tue 2009-05-19 10:26:05 +1000
    message:
      add NEWS entry
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
    ------------------------------------------------------------
    revno: 4370.3.3
    revision-id: ian.clatworthy at canonical.com-20090519002448-4cyopda2rpwpn3cm
    parent: ian.clatworthy at canonical.com-20090519002046-qfxrlf4d73upe1h8
    parent: pqm at pqm.ubuntu.com-20090518224144-3izdthppda5ievhg
    committer: Ian Clatworthy <ian.clatworthy at canonical.com>
    branch nick: faster-branch
    timestamp: Tue 2009-05-19 10:24:48 +1000
    message:
      merge bzr.dev r4372
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/foreign.py              foreign.py-20081112170002-olsxmandkk8qyfuq-1
      bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
      bzrlib/tests/blackbox/test_dpush.py test_dpush.py-20090108125928-st1td6le59g0vyv2-1
      bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
    ------------------------------------------------------------
    revno: 4370.3.2
    revision-id: ian.clatworthy at canonical.com-20090519002046-qfxrlf4d73upe1h8
    parent: ian.clatworthy at canonical.com-20090518044422-4789xalmkmw7x5fg
    committer: Ian Clatworthy <ian.clatworthy at canonical.com>
    branch nick: faster-branch
    timestamp: Tue 2009-05-19 10:20:46 +1000
    message:
      apply jam's review feedback
    modified:
      bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
      bzrlib/revisiontree.py         revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
      bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
    ------------------------------------------------------------
    revno: 4370.3.1
    revision-id: ian.clatworthy at canonical.com-20090518044422-4789xalmkmw7x5fg
    parent: pqm at pqm.ubuntu.com-20090516091716-x8ozyp5uuvsgmsfg
    committer: Ian Clatworthy <ian.clatworthy at canonical.com>
    branch nick: faster-branch
    timestamp: Mon 2009-05-18 14:44:22 +1000
    message:
      fix branch --no-tree performance
    modified:
      bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
=== modified file 'NEWS'
--- a/NEWS	2009-05-21 14:06:43 +0000
+++ b/NEWS	2009-05-22 01:44:19 +0000
@@ -18,6 +18,8 @@
 Improvements
 ************
 
+* ``bzr branch --notree`` is now faster. (Ian Clatworthy)
+
 Bug Fixes
 *********
 

=== modified file 'bzrlib/revisiontree.py'
--- a/bzrlib/revisiontree.py	2009-05-06 05:36:28 +0000
+++ b/bzrlib/revisiontree.py	2009-05-19 00:20:46 +0000
@@ -45,7 +45,8 @@
         self._rules_searcher = None
 
     def supports_tree_reference(self):
-        return True
+        return getattr(self._repository._format, "supports_tree_reference",
+            False)
 
     def get_parent_ids(self):
         """See Tree.get_parent_ids.

=== modified file 'bzrlib/tree.py'
--- a/bzrlib/tree.py	2009-05-07 05:08:46 +0000
+++ b/bzrlib/tree.py	2009-05-19 00:20:46 +0000
@@ -202,9 +202,10 @@
             specific_file_ids=specific_file_ids)
 
     def iter_references(self):
-        for path, entry in self.iter_entries_by_dir():
-            if entry.kind == 'tree-reference':
-                yield path, entry.file_id
+        if self.supports_tree_reference():
+            for path, entry in self.iter_entries_by_dir():
+                if entry.kind == 'tree-reference':
+                    yield path, entry.file_id
 
     def kind(self, file_id):
         raise NotImplementedError("Tree subclass %s must implement kind"