Bazaar

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

  1. remote-addinvdelta
  2. Merge into bzr.dev
Proposed by Jelmer Vernooij
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp:~jelmer/bzr/remote-addinvdelta
Merge into: lp:bzr
Diff against target: 31 lines (+6/-2)
2 files modified
NEWS (+3/-0)
bzrlib/remote.py (+3/-2)
To merge this branch: bzr merge lp:~jelmer/bzr/remote-addinvdelta
Reviewer Review Type Date Requested Status
Robert Collins (community) Needs Fixing
Patrick Noffke (community) code Approve
Review via email: mp+20846@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Revision history for this message
Patrick Noffke (patrick-noffke) wrote :

Works for me, fixes this bug:

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

review: Approve (code)
Revision history for this message
Robert Collins (lifeless) wrote :

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

review: Needs Fixing
Revision history for this message
Jelmer Vernooij (jelmer) wrote :

Fed to pqm

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'NEWS'
--- NEWS 2010-03-05 08:55:12 +0000
+++ NEWS 2010-03-09 23:50:44 +0000
@@ -107,6 +107,9 @@
107 the debugger won't kill the session.107 the debugger won't kill the session.
108 (Martin <gzlist@googlemail.com>, #162502)108 (Martin <gzlist@googlemail.com>, #162502)
109109
110* Allow additional arguments to
111 ``RemoteRepository.add_inventory_by_delta()``. (Jelmer Vernooij, #532631)
112
110* Tolerate patches with leading noise in ``bzr-handle-patch``.113* Tolerate patches with leading noise in ``bzr-handle-patch``.
111 (Toshio Kuratomi, Martin Pool, #502076)114 (Toshio Kuratomi, Martin Pool, #502076)
112115
113116
=== 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 @@
1234 return self._real_repository.add_inventory(revid, inv, parents)1234 return self._real_repository.add_inventory(revid, inv, parents)
12351235
1236 def add_inventory_by_delta(self, basis_revision_id, delta, new_revision_id,1236 def add_inventory_by_delta(self, basis_revision_id, delta, new_revision_id,
1237 parents):1237 parents, basis_inv=None, propagate_caches=False):
1238 self._ensure_real()1238 self._ensure_real()
1239 return self._real_repository.add_inventory_by_delta(basis_revision_id,1239 return self._real_repository.add_inventory_by_delta(basis_revision_id,
1240 delta, new_revision_id, parents)1240 delta, new_revision_id, parents, basis_inv=basis_inv,
1241 propagate_caches=propagate_caches)
12411242
1242 def add_revision(self, rev_id, rev, inv=None, config=None):1243 def add_revision(self, rev_id, rev, inv=None, config=None):
1243 self._ensure_real()1244 self._ensure_real()