launchpad-reviewers team mailing list archive
-
launchpad-reviewers team
-
Mailing list archive
-
Message #00459
[Merge] lp:~abentley/launchpad/new-bzr into lp:launchpad/devel
Aaron Bentley has proposed merging lp:~abentley/launchpad/new-bzr into lp:launchpad/devel.
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
= Summary =
Switch to bzr 2.2b4
== Proposed fix ==
None
== Pre-implementation notes ==
Thumper requested this
== Implementation details ==
There were some minor API changes, and the import and loom plugins needed
updates. Unfortunately, bzr-pqm is not handling merges very well because of
branch format differences, so I had to switch to loom trunk temporarily. I
will switch to a launchpad-pqm branch before landing.
I had to change the DirectBranchCommit handling because apparently unstacking
the branch has the side-effect of unlocking its repository. But I think the
revised code is cleaner anyhow.
I disabled documentation of bzrlib because of bad interactions between the
documentation system and bzr's lazy imports.
== Tests ==
bin/test -v
== Demo and Q/A ==
None
= Launchpad lint =
Checking for conflicts and issues in changed files.
Linting changed files:
lib/lp/code/mail/codehandler.py
lib/lp/codehosting/vfs/tests/test_transport.py
versions.cfg
lib/lp/code/model/diff.py
lib/lp/codehosting/tests/test_acceptance.py
lib/lp/codehosting/tests/test_bzrutils.py
lib/lp/translations/scripts/translations_to_branch.py
lib/lp/codehosting/codeimport/tests/test_worker.py
utilities/sourcedeps.conf
configs/development/apidoc-configure-normal.zcml
lib/lp/codehosting/puller/worker.py
./lib/lp/code/mail/codehandler.py
57: E302 expected 2 blank lines, found 1
60: E302 expected 2 blank lines, found 1
63: E302 expected 2 blank lines, found 1
521: Line exceeds 78 characters.
./lib/lp/code/model/diff.py
13: 'Branch' imported but unused
144: E301 expected 1 blank line, found 0
./lib/lp/codehosting/tests/test_acceptance.py
148: E202 whitespace before '}'
./lib/lp/codehosting/tests/test_bzrutils.py
154: E301 expected 1 blank line, found 0
166: E301 expected 1 blank line, found 0
210: E302 expected 2 blank lines, found 3
263: E301 expected 1 blank line, found 0
./lib/lp/codehosting/codeimport/tests/test_worker.py
91: E301 expected 1 blank line, found 0
339: E231 missing whitespace after ','
348: E231 missing whitespace after ','
359: E231 missing whitespace after ','
360: E231 missing whitespace after ','
373: E231 missing whitespace after ','
378: E231 missing whitespace after ','
388: E231 missing whitespace after ','
395: E231 missing whitespace after ','
403: E231 missing whitespace after ','
412: E231 missing whitespace after ','
417: E231 missing whitespace after ','
430: E231 missing whitespace after ','
440: E231 missing whitespace after ','
445: E302 expected 2 blank lines, found 3
478: E301 expected 1 blank line, found 0
618: E301 expected 1 blank line, found 0
818: E203 whitespace before ':'
1000: E302 expected 2 blank lines, found 3
1056: E302 expected 2 blank lines, found 3
./lib/lp/codehosting/puller/worker.py
444: E231 missing whitespace after ','
507: E231 missing whitespace after ','
--
https://code.launchpad.net/~abentley/launchpad/new-bzr/+merge/31888
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~abentley/launchpad/new-bzr into lp:launchpad/devel.
=== modified file 'configs/development/apidoc-configure-normal.zcml'
--- configs/development/apidoc-configure-normal.zcml 2010-07-24 02:27:19 +0000
+++ configs/development/apidoc-configure-normal.zcml 2010-08-05 20:47:50 +0000
@@ -90,7 +90,6 @@
<apidoc:rootModule module="martian" />
<apidoc:rootModule module="manuel" />
<apidoc:rootModule module="chameleon" />
- <apidoc:rootModule module="bzrlib" />
<apidoc:rootModule module="storm" />
<apidoc:bookchapter
=== modified file 'lib/lp/code/mail/codehandler.py'
--- lib/lp/code/mail/codehandler.py 2010-08-02 02:51:42 +0000
+++ lib/lp/code/mail/codehandler.py 2010-08-05 20:47:50 +0000
@@ -545,8 +545,12 @@
# access to any needed but not supplied revisions.
md.target_branch = target_url
md.install_revisions(bzr_branch.repository)
- bzr_branch.pull(bzr_branch, stop_revision=md.revision_id,
- overwrite=True)
+ bzr_branch.lock_write()
+ try:
+ bzr_branch.pull(bzr_branch, stop_revision=md.revision_id,
+ overwrite=True)
+ finally:
+ bzr_branch.unlock()
def findMergeDirectiveAndComment(self, message):
"""Extract the comment and Merge Directive from a SignedMessage."""
=== modified file 'lib/lp/code/model/diff.py'
--- lib/lp/code/model/diff.py 2010-08-02 02:13:52 +0000
+++ lib/lp/code/model/diff.py 2010-08-05 20:47:50 +0000
@@ -140,7 +140,7 @@
source_revision)
merger = Merge3Merger(
merge_target, merge_target, merge_base, merge_source,
- do_merge=False)
+ this_branch=target_branch, do_merge=False)
def dummy_warning(self, *args, **kwargs):
pass
real_warning = trace.warning
=== modified file 'lib/lp/codehosting/codeimport/tests/test_worker.py'
--- lib/lp/codehosting/codeimport/tests/test_worker.py 2010-08-02 23:01:15 +0000
+++ lib/lp/codehosting/codeimport/tests/test_worker.py 2010-08-05 20:47:50 +0000
@@ -952,7 +952,7 @@
t = get_transport(self.get_url('.'))
t.mkdir('reference')
a_bzrdir = BzrDir.create(self.get_url('reference'))
- BranchReferenceFormat().initialize(a_bzrdir, branch)
+ BranchReferenceFormat().initialize(a_bzrdir, target_branch=branch)
return a_bzrdir.root_transport.base
def test_reject_branch_reference(self):
=== modified file 'lib/lp/codehosting/puller/worker.py'
--- lib/lp/codehosting/puller/worker.py 2010-04-21 01:56:51 +0000
+++ lib/lp/codehosting/puller/worker.py 2010-08-05 20:47:50 +0000
@@ -503,7 +503,7 @@
def get_boolean(self, prompt):
"""If we're asked to break a lock like a stale lock of ours, say yes.
"""
- assert prompt.startswith('Break lock'), (
+ assert prompt.startswith('Break '), (
"Didn't expect prompt %r" % (prompt,))
branch_id = self.puller_worker_protocol.branch_id
if get_lock_id_for_branch_id(branch_id) in prompt:
=== modified file 'lib/lp/codehosting/tests/test_acceptance.py'
--- lib/lp/codehosting/tests/test_acceptance.py 2010-04-19 06:35:23 +0000
+++ lib/lp/codehosting/tests/test_acceptance.py 2010-08-05 20:47:50 +0000
@@ -242,10 +242,7 @@
creator_id, '/~%s/%s/%s' % (user, product, branch))
branch_url = 'file://' + os.path.abspath(
os.path.join(branch_root, branch_id_to_path(branch_id)))
- self.runInChdir(
- self.local_branch_path,
- self.run_bzr, ['push', '--create-prefix', branch_url],
- retcode=None)
+ self.push(self.local_branch_path, branch_url, ['--create-prefix'])
return branch_url
=== modified file 'lib/lp/codehosting/tests/test_bzrutils.py'
--- lib/lp/codehosting/tests/test_bzrutils.py 2010-04-23 01:47:30 +0000
+++ lib/lp/codehosting/tests/test_bzrutils.py 2010-08-05 20:47:50 +0000
@@ -14,7 +14,7 @@
from bzrlib.branch import Branch, BranchReferenceFormat
from bzrlib.bzrdir import BzrDir, format_registry
from bzrlib.remote import RemoteBranch
-from bzrlib.smart import server
+from bzrlib.tests import test_server
from bzrlib.tests import (
multiply_tests, TestCase, TestCaseWithTransport, TestLoader,
TestNotApplicable)
@@ -191,7 +191,7 @@
# of the branch, repo and bzrdir, even if the branch is a
# RemoteBranch.
vfs_branch = self.make_branch('.')
- smart_server = server.SmartTCPServer_for_testing()
+ smart_server = test_server.SmartTCPServer_for_testing()
smart_server.start_server(self.get_vfs_only_server())
self.addCleanup(smart_server.stop_server)
remote_branch = Branch.open(smart_server.get_url())
=== modified file 'lib/lp/codehosting/vfs/tests/test_transport.py'
--- lib/lp/codehosting/vfs/tests/test_transport.py 2010-04-19 07:05:57 +0000
+++ lib/lp/codehosting/vfs/tests/test_transport.py 2010-08-05 20:47:50 +0000
@@ -43,6 +43,9 @@
BlockingProxy(branchfs), LocalTransport(local_path_to_url('.')))
self._chroot_servers = []
+ def get_bogus_url(self):
+ return self._scheme + 'bogus'
+
def _transportFactory(self, url):
"""See `LaunchpadInternalServer._transportFactory`.
=== modified file 'lib/lp/translations/scripts/translations_to_branch.py'
--- lib/lp/translations/scripts/translations_to_branch.py 2010-06-16 07:22:57 +0000
+++ lib/lp/translations/scripts/translations_to_branch.py 2010-08-05 20:47:50 +0000
@@ -103,22 +103,16 @@
# possible again to commit to these branches at some point.
# When that happens, remove this workaround and just call
# _makeDirectBranchCommit directly.
- committer = self._makeDirectBranchCommit(db_branch)
- if not db_branch.stacked_on:
- # The normal case.
- return committer
-
- self.logger.info("Unstacking branch to work around bug 375013.")
- try:
- committer.bzrbranch.set_stacked_on_url(None)
- finally:
- committer.unlock()
- self.logger.info("Done unstacking branch.")
-
- # This may have taken a while, so commit for good
- # manners.
- if self.txn:
- self.txn.commit()
+ if db_branch.stacked_on:
+ bzrbranch = db_branch.getBzrBranch()
+ self.logger.info("Unstacking branch to work around bug 375013.")
+ bzrbranch.set_stacked_on_url(None)
+ self.logger.info("Done unstacking branch.")
+
+ # This may have taken a while, so commit for good
+ # manners.
+ if self.txn:
+ self.txn.commit()
return self._makeDirectBranchCommit(db_branch)
=== modified file 'utilities/sourcedeps.conf'
--- utilities/sourcedeps.conf 2010-08-03 14:59:22 +0000
+++ utilities/sourcedeps.conf 2010-08-05 20:47:50 +0000
@@ -1,7 +1,7 @@
bzr-builder lp:~launchpad-pqm/bzr-builder/trunk;revno=65
bzr-git lp:~launchpad-pqm/bzr-git/devel;revno=257
-bzr-hg lp:~launchpad-pqm/bzr-hg/devel;revno=281
-bzr-loom lp:~launchpad-pqm/bzr-loom/trunk;revno=47
+bzr-hg lp:~launchpad-pqm/bzr-hg/devel;revno=282
+bzr-loom lp:bzr-loom;revno=126
bzr-svn lp:~launchpad-pqm/bzr-svn/devel;revno=2709
cscvs lp:~launchpad-pqm/launchpad-cscvs/devel;revno=432
dulwich lp:~launchpad-pqm/dulwich/devel;revno=423
=== modified file 'versions.cfg'
--- versions.cfg 2010-07-26 16:00:01 +0000
+++ versions.cfg 2010-08-05 20:47:50 +0000
@@ -5,7 +5,7 @@
# Alphabetical, case-insensitive, please! :-)
ampoule = 0.2.0
-bzr = 2.1.0
+bzr = 2.2b4
chameleon.core = 1.0b35
chameleon.zpt = 1.0b17
ClientForm = 0.2.10
