Rev 2793: Merge bzr.dev. in http://people.ubuntu.com/~robertc/baz2.0/repository

[Robert Collins]

At http://people.ubuntu.com/~robertc/baz2.0/repository

------------------------------------------------------------
revno: 2793
revision-id: robertc at robertcollins.net-20071005033340-7xtx7yko9nbraplo
parent: robertc at robertcollins.net-20071005031429-8zab3gybvpicu52l
parent: pqm at pqm.ubuntu.com-20071005032619-b6c99y625rawducb
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Fri 2007-10-05 13:33:40 +1000
message:
  Merge bzr.dev.
modified:
  bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
    ------------------------------------------------------------
    revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.8.1.46.1.18.1.1
    revision-id: pqm at pqm.ubuntu.com-20071005032619-b6c99y625rawducb
    parent: pqm at pqm.ubuntu.com-20071004223314-qpih4e2os3o2627a
    parent: robertc at robertcollins.net-20071004222814-1ejg4uepydfbacew
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2007-10-05 04:26:19 +0100
    message:
      (robertc) Reduce object creation volume during commit by reusing the repository graph object. (Robert Collins)
    modified:
      bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
    ------------------------------------------------------------
    revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.58
    revision-id: robertc at robertcollins.net-20071004222814-1ejg4uepydfbacew
    parent: robertc at robertcollins.net-20071003042301-a8uqkwlqr5owcqbo
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: commit
    timestamp: Fri 2007-10-05 08:28:14 +1000
    message:
      (robertc) Reduce object creation volume during commit by reusing the repository graph object. (Robert Collins)
    modified:
      bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
=== modified file 'bzrlib/repository.py'
--- a/bzrlib/repository.py	2007-10-05 03:14:29 +0000
+++ b/bzrlib/repository.py	2007-10-05 03:33:40 +0000
@@ -115,6 +115,7 @@
             self._timezone = int(timezone)
 
         self._generate_revision_if_needed()
+        self._repo_graph = repository.get_graph()
 
     def commit(self, message):
         """Make the actual commit.
@@ -292,7 +293,7 @@
         # XXX: Friction: parent_candidates should return a list not a dict
         #      so that we don't have to walk the inventories again.
         parent_candiate_entries = ie.parent_candidates(parent_invs)
-        head_set = self.repository.get_graph().heads(parent_candiate_entries.keys())
+        head_set = self._repo_graph.heads(parent_candiate_entries.keys())
         heads = []
         for inv in parent_invs:
             if ie.file_id in inv: