Rev 3885: Change the return of add_inventory_by_delta to also return the Inventory. in http://bzr.arbash-meinel.com/branches/bzr/1.11/add_inventory_by_delta

John Arbash Meinel john at arbash-meinel.com
Sun Dec 7 17:26:34 GMT 2008


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

------------------------------------------------------------
revno: 3885
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.
-------------- next part --------------
=== modified file 'bzrlib/repository.py'
--- a/bzrlib/repository.py	2008-12-05 17:25:01 +0000
+++ b/bzrlib/repository.py	2008-12-07 17:26:22 +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()
 



More information about the bazaar-commits mailing list