Rev 5078: (Jelmer) Handle new parameters in in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5078 [merge]
revision-id: pqm at pqm.ubuntu.com-20100310003856-dbh3pcbqw8y415zj
parent: pqm at pqm.ubuntu.com-20100308054919-m9xwgjimj2fz97j0
parent: jelmer at samba.org-20100309234840-ovbqlk6qgg0uf8oo
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2010-03-10 00:38:56 +0000
message:
  (Jelmer) Handle new parameters in
  	RemoteRepository.add_inventory_by_delta().
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
=== modified file 'NEWS'
--- a/NEWS	2010-03-05 08:55:12 +0000
+++ b/NEWS	2010-03-07 03:04:12 +0000
@@ -107,6 +107,9 @@
   the debugger won't kill the session.
   (Martin <gzlist at googlemail.com>, #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'
--- a/bzrlib/remote.py	2010-03-02 19:50:18 +0000
+++ b/bzrlib/remote.py	2010-03-09 23:48:40 +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()