Rev 3889: Merge in the new add_inventory_by_delta and handle the new return values. in http://bzr.arbash-meinel.com/branches/bzr/1.11/differ_serializer

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/1.11/differ_serializer

------------------------------------------------------------
revno: 3889
revision-id: john at arbash-meinel.com-20081207173303-ydamo2rxs3ngjhw0
parent: john at arbash-meinel.com-20081205222549-lri0j1a3wv37wtax
parent: john at arbash-meinel.com-20081207172622-r3hrmb872nwmezeu
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: differ_serializer
timestamp: Sun 2008-12-07 11:33:03 -0600
message:
  Merge in the new add_inventory_by_delta and handle the new return values.
modified:
  bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
  bzrlib/tests/per_repository/test_add_inventory_by_delta.py test_add_inventory_d-20081013002626-rut81igtlqb4590z-1
    ------------------------------------------------------------
    revno: 3884.1.1
    revision-id: john at arbash-meinel.com-20081207172622-r3hrmb872nwmezeu
    parent: john at arbash-meinel.com-20081205172501-a0g7ho4sl29q6dz9
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: add_inventory_by_delta
    timestamp: Sun 2008-12-07 11:26:22 -0600
    message:
      Change the return of add_inventory_by_delta to also return the Inventory.
    modified:
      bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
-------------- next part --------------
=== modified file 'bzrlib/repository.py'
--- a/bzrlib/repository.py	2008-12-05 22:25:49 +0000
+++ b/bzrlib/repository.py	2008-12-07 17:33:03 +0000
@@ -685,8 +685,10 @@
             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.
+        :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 not self.is_in_write_group():
             raise AssertionError("%r not in write group" % (self,))
@@ -701,7 +703,8 @@
             basis_inv = basis_tree.inventory
             basis_inv.apply_delta(delta)
             basis_inv.revision_id = new_revision_id
-            return self.add_inventory(new_revision_id, basis_inv, parents)
+            return (self.add_inventory(new_revision_id, basis_inv, parents),
+                    basis_inv)
         finally:
             basis_tree.unlock()
 

=== 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-05 16:07:04 +0000
+++ b/bzrlib/tests/per_repository/test_add_inventory_by_delta.py	2008-12-07 17:33:03 +0000
@@ -80,7 +80,7 @@
         repo_direct.commit_write_group()
         repo_delta = self._get_repo_in_write_group('delta')
         try:
-            delta_validator = repo_delta.add_inventory_by_delta(
+            delta_validator, inv = repo_delta.add_inventory_by_delta(
                 revision.NULL_REVISION, delta, revid, [])
         except:
             repo_delta.abort_write_group()