launchpad-reviewers team mailing list archive

[Jelmer Vernooij <jelmer@xxxxxxxxx>]

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

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~jelmer/launchpad/bzr-2.4b4/+merge/65237

Update to a newer upstream version of bzr, bzr 2.4b4.

This brings all of the goodness of the 2.4 series of bzr, including a number of performance improvements. 

It might help with bug 690021. 

It adds a server side hook for error logging in servers, the bzr side of bug 274578.

It fixes merging into an empty tree, which is one of the causes of bug 595328.
-- 
https://code.launchpad.net/~jelmer/launchpad/bzr-2.4b4/+merge/65237
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~jelmer/launchpad/bzr-2.4b4 into lp:launchpad.

=== modified file 'lib/lp/code/browser/branch.py'
--- lib/lp/code/browser/branch.py	2011-06-17 09:56:57 +0000
+++ lib/lp/code/browser/branch.py	2011-06-20 17:24:35 +0000
@@ -126,7 +126,6 @@
 from lp.code.browser.decorations import DecoratedBranch
 from lp.code.browser.sourcepackagerecipelisting import HasRecipesMenuMixin
 from lp.code.enums import (
-    BranchLifecycleStatus,
     BranchType,
     CodeImportResultStatus,
     CodeImportReviewStatus,

=== modified file 'lib/lp/code/bzr.py'
--- lib/lp/code/bzr.py	2011-06-02 19:27:36 +0000
+++ lib/lp/code/bzr.py	2011-06-20 17:24:35 +0000
@@ -20,34 +20,38 @@
 
 from bzrlib.branch import (
     BranchReferenceFormat,
-    BzrBranchFormat4,
     BzrBranchFormat5,
     BzrBranchFormat6,
     BzrBranchFormat7,
     )
 from bzrlib.bzrdir import (
-    BzrDirFormat4,
-    BzrDirFormat5,
-    BzrDirFormat6,
     BzrDirMetaFormat1,
     )
 from bzrlib.plugins.loom.branch import (
     BzrBranchLoomFormat1,
     BzrBranchLoomFormat6,
     )
+from bzrlib.plugins.weave_fmt.branch import (
+    BzrBranchFormat4,
+    )
+from bzrlib.plugins.weave_fmt.bzrdir import (
+    BzrDirFormat4,
+    BzrDirFormat5,
+    BzrDirFormat6,
+    )
 from bzrlib.repofmt.groupcompress_repo import RepositoryFormat2a
 from bzrlib.repofmt.knitrepo import (
     RepositoryFormatKnit1,
     RepositoryFormatKnit3,
     RepositoryFormatKnit4,
     )
-from bzrlib.repofmt.pack_repo import (
+from bzrlib.repofmt.knitpack_repo import (
     RepositoryFormatKnitPack1,
     RepositoryFormatKnitPack3,
     RepositoryFormatKnitPack4,
     RepositoryFormatKnitPack5,
     )
-from bzrlib.repofmt.weaverepo import (
+from bzrlib.plugins.weave_fmt.repository import (
     RepositoryFormat4,
     RepositoryFormat5,
     RepositoryFormat6,

=== modified file 'lib/lp/code/model/tests/test_branchjob.py'
--- lib/lp/code/model/tests/test_branchjob.py	2011-05-23 11:06:50 +0000
+++ lib/lp/code/model/tests/test_branchjob.py	2011-06-20 17:24:35 +0000
@@ -17,7 +17,7 @@
     BzrBranchFormat7,
     )
 from bzrlib.bzrdir import BzrDirMetaFormat1
-from bzrlib.repofmt.pack_repo import RepositoryFormatKnitPack6
+from bzrlib.repofmt.knitpack_repo import RepositoryFormatKnitPack6
 from bzrlib.revision import NULL_REVISION
 from bzrlib.transport import get_transport
 import pytz

=== modified file 'lib/lp/codehosting/__init__.py'
--- lib/lp/codehosting/__init__.py	2011-03-30 15:16:35 +0000
+++ lib/lp/codehosting/__init__.py	2011-06-20 17:24:35 +0000
@@ -70,6 +70,18 @@
     __import__("bzrlib.plugins.%s" % plugin_name)
 
 
+def load_bundled_plugin(plugin_name):
+    """Load a plugin bundled with Bazaar."""
+    from bzrlib.plugin import get_core_plugin_path
+    from bzrlib import plugins
+    if get_core_plugin_path() not in plugins.__path__:
+        plugins.__path__.append(get_core_plugin_path())
+    __import__("bzrlib.plugins.%s" % plugin_name)
+
+
+load_bundled_plugin("weave_fmt")
+
+
 def remove_hook(self, hook):
     """Remove the hook from the HookPoint"""
     self._callbacks.remove(hook)

=== modified file 'lib/lp/codehosting/puller/tests/test_worker.py'
--- lib/lp/codehosting/puller/tests/test_worker.py	2010-10-15 08:47:20 +0000
+++ lib/lp/codehosting/puller/tests/test_worker.py	2011-06-20 17:24:35 +0000
@@ -25,7 +25,7 @@
     NotBranchError,
     NotStacked,
     )
-from bzrlib.repofmt.pack_repo import RepositoryFormatKnitPack1
+from bzrlib.repofmt.knitpack_repo import RepositoryFormatKnitPack1
 from bzrlib.revision import NULL_REVISION
 from bzrlib.tests import (
     TestCaseInTempDir,

=== modified file 'lib/lp/codehosting/puller/tests/test_worker_formats.py'
--- lib/lp/codehosting/puller/tests/test_worker_formats.py	2010-08-20 20:31:18 +0000
+++ lib/lp/codehosting/puller/tests/test_worker_formats.py	2011-06-20 17:24:35 +0000
@@ -7,14 +7,18 @@
 
 import unittest
 
+import lp.codehosting # for bzr plugins
+
 from bzrlib.branch import Branch
 from bzrlib.bzrdir import (
-    BzrDirFormat6,
     BzrDirMetaFormat1,
     )
 from bzrlib.repofmt.knitrepo import RepositoryFormatKnit1
-from bzrlib.repofmt.pack_repo import RepositoryFormatKnitPack5
-from bzrlib.repofmt.weaverepo import (
+from bzrlib.repofmt.knitpack_repo import RepositoryFormatKnitPack5
+from bzrlib.plugins.weave_fmt.bzrdir import (
+    BzrDirFormat6,
+    )
+from bzrlib.plugins.weave_fmt.repository import (
     RepositoryFormat6,
     RepositoryFormat7,
     )

=== modified file 'lib/lp/codehosting/puller/worker.py'
--- lib/lp/codehosting/puller/worker.py	2011-06-03 01:00:53 +0000
+++ lib/lp/codehosting/puller/worker.py	2011-06-20 17:24:35 +0000
@@ -8,17 +8,22 @@
 import sys
 import urllib2
 
+import lp.codehosting # to load bzr plugins
+
 from bzrlib import errors
 from bzrlib.branch import (
     Branch,
+    )
+from bzrlib.bzrdir import BzrDir
+from bzrlib.plugins.weave_fmt.branch import (
     BzrBranchFormat4,
     )
-from bzrlib.bzrdir import BzrDir
-from bzrlib.repofmt.weaverepo import (
+from bzrlib.plugins.weave_fmt.repository import (
     RepositoryFormat4,
     RepositoryFormat5,
     RepositoryFormat6,
     )
+
 import bzrlib.ui
 from bzrlib.ui import SilentUIFactory
 from lazr.uri import InvalidURIError

=== modified file 'versions.cfg'
--- versions.cfg	2011-06-04 04:34:59 +0000
+++ versions.cfg	2011-06-20 17:24:35 +0000
@@ -6,7 +6,7 @@
 
 ampoule = 0.2.0
 BeautifulSoup = 3.1.0.1
-bzr = 2.3.3
+bzr = 2.4b4
 chameleon.core = 1.0b35
 chameleon.zpt = 1.0b17
 ClientForm = 0.2.10