launchpad-reviewers team mailing list archive

[Jelmer Vernooij <jelmer.vernooij@xxxxxxxxxxxxx>]

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

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

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

Update Bazaar to 2.5.1. This version includes various performance improvements as well as a bunch of bug fixes.

== QA ==

I would like to land this on db-devel first, so we can give it a more extended test run on staging. There is a fair number of changes to the HPSS in this landing, which would be good to test for a bit longer given our previous experiences updating bzr. 

See also https://dev.launchpad.net/Code/BazaarUpgrades
-- 
https://code.launchpad.net/~jelmer/launchpad/bzr-2.5.1/+merge/112523
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~jelmer/launchpad/bzr-2.5.1 into lp:launchpad.

=== modified file 'lib/lp/codehosting/__init__.py'
--- lib/lp/codehosting/__init__.py	2011-12-29 05:29:36 +0000
+++ lib/lp/codehosting/__init__.py	2012-06-28 09:33:05 +0000
@@ -21,6 +21,7 @@
 
 from lp.services.config import config
 
+bzrlib.initialize()
 
 def get_bzr_path():
     """Find the path to the copy of Bazaar for this rocketfuel instance"""

=== 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	2012-06-28 09:33:05 +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	2012-03-20 04:32:02 +0000
+++ utilities/sourcedeps.cache	2012-06-28 09:33:05 +0000
@@ -4,20 +4,20 @@
         "launchpad@xxxxxxxxxxxxxxxxx-20111114140506-6bmt9isw6lcud7yt"
     ], 
     "bzr-git": [
-        274, 
-        "launchpad@xxxxxxxxxxxxxxxxx-20111215014415-hjc2z537k31pny0v"
+        276, 
+        "launchpad@xxxxxxxxxxxxxxxxx-20120627155618-3lv9t9jw3b5t9g6k"
     ], 
     "bzr-hg": [
-        292, 
-        "launchpad@xxxxxxxxxxxxxxxxx-20111011005914-kzwlk4nk5u44bntc"
+        295, 
+        "launchpad@xxxxxxxxxxxxxxxxx-20120627155504-04tt5fb9gq5lx7ee"
     ], 
     "bzr-loom": [
         51, 
         "launchpad@xxxxxxxxxxxxxxxxx-20110921142504-p5xovac1r571h5iq"
     ], 
     "bzr-svn": [
-        2720, 
-        "launchpad@xxxxxxxxxxxxxxxxx-20111102161617-u478fn7rhbkekhbe"
+        2724, 
+        "launchpad@xxxxxxxxxxxxxxxxx-20120627153220-6ntxuuhdup7ie8ea"
     ], 
     "cscvs": [
         432, 
@@ -28,8 +28,8 @@
         "aaron@xxxxxxxxxxxxxxxx-20100715135013-uoi3q430urx9gwb8"
     ], 
     "dulwich": [
-        435, 
-        "launchpad@xxxxxxxxxxxxxxxxx-20111215014116-j7lw563fh7kuqp0n"
+        437, 
+        "launchpad@xxxxxxxxxxxxxxxxx-20120627160422-60kkcr5wqn6ih1j1"
     ], 
     "loggerhead": [
         472, 
@@ -64,8 +64,8 @@
         "launchpad@xxxxxxxxxxxxxxxxx-20110329053617-irncjfr14k0m00zp"
     ], 
     "subvertpy": [
-        2049, 
-        "launchpad@xxxxxxxxxxxxxxxxx-20111102161913-94jrf4rhs0x9htah"
+        2051, 
+        "launchpad@xxxxxxxxxxxxxxxxx-20120627155818-0m7c94csgij9f1ee"
     ], 
     "testresources": [
         16, 

=== modified file 'utilities/sourcedeps.conf'
--- utilities/sourcedeps.conf	2012-06-25 17:46:46 +0000
+++ utilities/sourcedeps.conf	2012-06-28 09:33:05 +0000
@@ -8,18 +8,18 @@
 #########################################################
 
 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-git lp:~launchpad-pqm/bzr-git/devel;revno=276
+bzr-hg lp:~launchpad-pqm/bzr-hg/devel;revno=295
 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=2724
 cscvs lp:~launchpad-pqm/launchpad-cscvs/devel;revno=432
-dulwich lp:~launchpad-pqm/dulwich/devel;revno=435
+dulwich lp:~launchpad-pqm/dulwich/devel;revno=437
 difftacular lp:~launchpad/difftacular/trunk;revno=6
 loggerhead lp:~loggerhead-team/loggerhead/trunk-rich;revno=472
 lpreview lp:~launchpad-pqm/bzr-lpreview/devel;revno=23
 mailman lp:~launchpad-pqm/mailman/2.1;revno=976
 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=2051
 python-debian lp:~launchpad-pqm/python-debian/devel;revno=186
 testresources lp:~launchpad-pqm/testresources/dev;revno=16

=== modified file 'versions.cfg'
--- versions.cfg	2012-06-22 14:56:27 +0000
+++ versions.cfg	2012-06-28 09:33:05 +0000
@@ -10,10 +10,7 @@
 argparse = 1.2.1
 BeautifulSoup = 3.1.0.1
 bson = 0.3.2
-# The source for this version of bzr is at lp:~benji/bzr/bug-998040
-# 2.5.0.lp.2 was built from revision 6156.
-# To build: "make dist" and look one directory up from PWD
-bzr = 2.5.0.lp.2
+bzr = 2.5.1
 celery = 2.5.1
 Chameleon = 2.4.0
 ClientForm = 0.2.10