← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~jelmer/launchpad/bzr-r6374 into lp:launchpad

 

Jelmer Vernooij has proposed merging lp:~jelmer/launchpad/bzr-r6374 into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #608640 in Launchpad itself: "bzr export from remote branches downloads way more data than it should"
  https://bugs.launchpad.net/launchpad/+bug/608640

For more details, see:
https://code.launchpad.net/~jelmer/launchpad/bzr-r6374/+merge/85867

Update the bzr used by Launchpad to a newer upstream snapshot.

This snapshot introduces some new calls in the smart server ("bzr+ssh:"), which greatly improve both the number of roundtrips and the bandwidth for some bzr operations ("bzr export", "bzr checkout", "bzr log") against a remote server.
-- 
https://code.launchpad.net/~jelmer/launchpad/bzr-r6374/+merge/85867
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~jelmer/launchpad/bzr-r6374 into lp:launchpad.
=== modified file 'lib/lp/codehosting/vfs/transport.py'
--- lib/lp/codehosting/vfs/transport.py	2011-07-18 20:46:27 +0000
+++ lib/lp/codehosting/vfs/transport.py	2011-12-15 13:56:07 +0000
@@ -264,6 +264,12 @@
     def _abspath(self, relpath):
         return self._async_transport._abspath(relpath)
 
+    def get_segment_parameters(self):
+        return self._async_transport.get_segment_parameters()
+
+    def set_segment_parameter(self, name, value):
+        return self._async_transport.set_segment_parameter(name, value)
+
     def clone(self, offset=None):
         """See `bzrlib.transport.Transport`."""
         cloned_async = self._async_transport.clone(offset)

=== modified file 'utilities/sourcedeps.cache'
--- utilities/sourcedeps.cache	2011-12-15 01:47:13 +0000
+++ utilities/sourcedeps.cache	2011-12-15 13:56:07 +0000
@@ -8,16 +8,16 @@
         "launchpad@xxxxxxxxxxxxxxxxx-20111215014415-hjc2z537k31pny0v"
     ], 
     "bzr-hg": [
-        292, 
-        "launchpad@xxxxxxxxxxxxxxxxx-20111011005914-kzwlk4nk5u44bntc"
+        293, 
+        "launchpad@xxxxxxxxxxxxxxxxx-20111215133805-890i1xmefgmnvq1y"
     ], 
     "bzr-loom": [
         51, 
         "launchpad@xxxxxxxxxxxxxxxxx-20110921142504-p5xovac1r571h5iq"
     ], 
     "bzr-svn": [
-        2720, 
-        "launchpad@xxxxxxxxxxxxxxxxx-20111102161617-u478fn7rhbkekhbe"
+        2721, 
+        "launchpad@xxxxxxxxxxxxxxxxx-20111215105218-3mo9q2ew2u51avnp"
     ], 
     "cscvs": [
         432, 
@@ -64,8 +64,8 @@
         "launchpad@xxxxxxxxxxxxxxxxx-20110329053617-irncjfr14k0m00zp"
     ], 
     "subvertpy": [
-        2049, 
-        "launchpad@xxxxxxxxxxxxxxxxx-20111102161913-94jrf4rhs0x9htah"
+        2050, 
+        "launchpad@xxxxxxxxxxxxxxxxx-20111215104617-0bz4jqnya0k8c68m"
     ], 
     "testresources": [
         16, 

=== modified file 'utilities/sourcedeps.conf'
--- utilities/sourcedeps.conf	2011-12-15 01:47:13 +0000
+++ utilities/sourcedeps.conf	2011-12-15 13:56:07 +0000
@@ -1,8 +1,8 @@
 bzr-builder lp:~launchpad-pqm/bzr-builder/trunk;revno=70
 bzr-git lp:~launchpad-pqm/bzr-git/devel;revno=274
-bzr-hg lp:~launchpad-pqm/bzr-hg/devel;revno=292
+bzr-hg lp:~launchpad-pqm/bzr-hg/devel;revno=293
 bzr-loom lp:~launchpad-pqm/bzr-loom/trunk;revno=51
-bzr-svn lp:~launchpad-pqm/bzr-svn/devel;revno=2720
+bzr-svn lp:~launchpad-pqm/bzr-svn/devel;revno=2721
 cscvs lp:~launchpad-pqm/launchpad-cscvs/devel;revno=432
 dulwich lp:~launchpad-pqm/dulwich/devel;revno=435
 difftacular lp:difftacular;revno=6
@@ -12,6 +12,6 @@
 mustache.js lp:mustache.js;revno=166
 old_xmlplus lp:~launchpad-pqm/dtdparser/trunk;revno=4
 pygettextpo lp:~launchpad-pqm/pygettextpo/trunk;revno=24
-subvertpy lp:~launchpad-pqm/subvertpy/trunk;revno=2049
+subvertpy lp:~launchpad-pqm/subvertpy/trunk;revno=2050
 python-debian lp:~launchpad-pqm/python-debian/devel;revno=186
 testresources lp:~launchpad-pqm/testresources/dev;revno=16

=== modified file 'versions.cfg'
--- versions.cfg	2011-12-09 06:24:02 +0000
+++ versions.cfg	2011-12-15 13:56:07 +0000
@@ -8,7 +8,7 @@
 amqplib = 0.6.1
 BeautifulSoup = 3.1.0.1
 bson = 0.3.2
-bzr = 2.5.0dev2-r6152
+bzr = 2.5.0dev5-r6374
 Chameleon = 2.4.0
 ClientForm = 0.2.10
 cssutils = 0.9.7


Follow ups