Rev 3804: Track down more code paths that were broken by the merge. in http://bzr.arbash-meinel.com/branches/bzr/brisbane/merge_dev

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/brisbane/merge_dev

------------------------------------------------------------
revno: 3804
revision-id: john at arbash-meinel.com-20081207175444-j4gllyvbu3bkzpsg
parent: john at arbash-meinel.com-20081207174943-gte3dtx95gxm0sw4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: merge_dev
timestamp: Sun 2008-12-07 11:54:44 -0600
message:
  Track down more code paths that were broken by the merge.
-------------- next part --------------
=== modified file 'bzrlib/repofmt/pack_repo.py'
--- a/bzrlib/repofmt/pack_repo.py	2008-12-07 17:49:43 +0000
+++ b/bzrlib/repofmt/pack_repo.py	2008-12-07 17:54:44 +0000
@@ -2126,10 +2126,10 @@
         return self._inventory_add_lines(revision_id, parents,
             inv_lines, check_content=False)
 
-    def add_inventory_delta(self, basis_revision_id, delta, new_revision_id,
-        parents):
+    def add_inventory_by_delta(self, basis_revision_id, delta, new_revision_id,
+                               parents):
         """Add a new inventory expressed as a delta against another revision.
-        
+
         :param basis_revision_id: The inventory id the delta was created
             against.
         :param delta: The inventory delta (see Inventory.apply_delta for
@@ -2142,12 +2142,13 @@
             graph access, as well as for those that pun ancestry with delta
             compression.
 
-        :returns: The validator(which is a sha1 digest, though what is sha'd is
-            repository format specific) of the serialized inventory and 
-            the resulting inventory.
+        :returns: (validator, new_inv)
+            The validator(which is a sha1 digest, though what is sha'd is
+            repository format specific) of the serialized inventory, and the
+            resulting inventory.
         """
         if basis_revision_id == _mod_revision.NULL_REVISION:
-            return KnitPackRepository.add_inventory_delta(self,
+            return KnitPackRepository.add_inventory_by_delta(self,
                 basis_revision_id, delta, new_revision_id, parents)
         if not self.is_in_write_group():
             raise AssertionError("%r not in write group" % (self,))

=== modified file 'bzrlib/repository.py'
--- a/bzrlib/repository.py	2008-12-07 17:40:43 +0000
+++ b/bzrlib/repository.py	2008-12-07 17:54:44 +0000
@@ -197,8 +197,8 @@
             except IndexError:
                 basis_id = _mod_revision.NULL_REVISION
             try:
-                self.inv_sha1, _ = self.repository.add_inventory_delta(
-                    basis_id, self.basis_delta, self._new_revision_id,
+                self.inv_sha1, _ = self.repository.add_inventory_by_delta(
+                    basis_id, self._basis_delta, self._new_revision_id,
                     self.parents)
                 return
             except errors.NoSuchRevision:
@@ -2184,7 +2184,7 @@
                 repository.add_inventory(rev.revision_id, inv, present_parents)
             else:
                 delta = inv._make_delta(basis_inv)
-                repository.add_inventory_delta(rev.parent_ids[0], delta,
+                repository.add_inventory_by_delta(rev.parent_ids[0], delta,
                     rev.revision_id, present_parents)
         else:
             repository.add_inventory(rev.revision_id, inv, present_parents)

=== modified file 'bzrlib/tests/per_repository/test_add_inventory_by_delta.py'
--- a/bzrlib/tests/per_repository/test_add_inventory_by_delta.py	2008-12-07 17:40:43 +0000
+++ b/bzrlib/tests/per_repository/test_add_inventory_by_delta.py	2008-12-07 17:54:44 +0000
@@ -88,4 +88,4 @@
         else:
             repo_delta.commit_write_group()
         self.assertEqual(add_validator, delta_validator)
-        self.assertEqual(new_inv, result)
+        self.assertEqual(new_inv, inv)