Merge lp:~jelmer/bzr/remote-addinvdelta into lp:bzr

[Jelmer Vernooij]

(Jelmer) Handle new parameters in RemoteRepository.add_inventory_by_delta().

This makes RemoteRepository.add_inventory_by_delta() support the extra arguments that Repository.add_inventory_by_delta() also supports.

[Patrick Noffke (patrick-noffke)]

Works for me, fixes this bug:

https://bugs.launchpad.net/bzr-svn/+bug/509386

review: Approve (code)

[Robert Collins (lifeless)]

please pass the keyword args as keyword args.
bb:tweak.

review: Needs Fixing

[Jelmer Vernooij (jelmer)]

Fed to pqm

star-merge http://bazaar.launchpad.net/~jelmer/bzr/remote-addinvdelta http://bazaar.launchpad.net/~bzr-pqm/bzr/bzr.dev

=== modified file 'NEWS'
--- NEWS	2010-03-05 08:55:12 +0000
+++ NEWS	2010-03-09 23:50:44 +0000
@@ -107,6 +107,9 @@
   the debugger won't kill the session.
   (Martin <[e-mail]>, #162502)
 
+* Allow additional arguments to
+  ``RemoteRepository.add_inventory_by_delta()``. (Jelmer Vernooij, #532631)
+
 * Tolerate patches with leading noise in ``bzr-handle-patch``.
   (Toshio Kuratomi, Martin Pool, #502076)
 

=== modified file 'bzrlib/remote.py'
--- bzrlib/remote.py	2010-03-02 19:50:18 +0000
+++ bzrlib/remote.py	2010-03-09 23:50:44 +0000
@@ -1234,10 +1234,11 @@
         return self._real_repository.add_inventory(revid, inv, parents)
 
     def add_inventory_by_delta(self, basis_revision_id, delta, new_revision_id,
-                               parents):
+            parents, basis_inv=None, propagate_caches=False):
         self._ensure_real()
         return self._real_repository.add_inventory_by_delta(basis_revision_id,
-            delta, new_revision_id, parents)
+            delta, new_revision_id, parents, basis_inv=basis_inv,
+            propagate_caches=propagate_caches)
 
     def add_revision(self, rev_id, rev, inv=None, config=None):
         self._ensure_real()