Rev 2946: Start maintaining a list of parent trees in commit. in http://people.ubuntu.com/~robertc/baz2.0/commit-builder

[Robert Collins]

At http://people.ubuntu.com/~robertc/baz2.0/commit-builder

------------------------------------------------------------
revno: 2946
revision-id:robertc at robertcollins.net-20071026234414-dbojmo930u99s4wn
parent: robertc at robertcollins.net-20071026232936-l26eaa4zmmmrfq3f
committer: Robert Collins <robertc at robertcollins.net>
branch nick: commit-builder
timestamp: Sat 2007-10-27 09:44:14 +1000
message:
  Start maintaining a list of parent trees in commit.
modified:
  bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
=== modified file 'bzrlib/commit.py'
--- a/bzrlib/commit.py	2007-10-26 23:29:36 +0000
+++ b/bzrlib/commit.py	2007-10-26 23:44:14 +0000
@@ -619,14 +619,15 @@
         # TODO: Make sure that this list doesn't contain duplicate 
         # entries and the order is preserved when doing this.
         self.parents = self.work_tree.get_parent_ids()
-        self.parent_invs = [self.basis_inv]
+        self.parent_trees = [self.basis_tree]
         for revision in self.parents[1:]:
             if self.branch.repository.has_revision(revision):
                 mutter('commit parent revision {%s}', revision)
-                inventory = self.branch.repository.get_inventory(revision)
-                self.parent_invs.append(inventory)
+                parent = self.branch.repository.revision_tree(revision)
+                self.parent_trees.append(parent)
             else:
                 mutter('commit parent ghost revision {%s}', revision)
+        self.parent_invs = [parent.inventory for parent in self.parent_trees]
 
     def _update_builder_with_changes(self):
         """Update the commit builder with the data about what has changed.