Rev 3201: * The ``register-branch`` command will now use the public url of the branch in http://people.ubuntu.com/~robertc/baz2.0/register-branch.public_location
Robert Collins
robertc at robertcollins.net
Fri Jan 25 10:46:40 GMT 2008
At http://people.ubuntu.com/~robertc/baz2.0/register-branch.public_location
------------------------------------------------------------
revno: 3201
revision-id:robertc at robertcollins.net-20080125104610-4qweeqqch2feyxdv
parent: pqm at pqm.ubuntu.com-20080124050323-gsgsp2em7v1ugtnz
committer: Robert Collins <robertc at robertcollins.net>
branch nick: register-branch.public_location
timestamp: Fri 2008-01-25 21:46:10 +1100
message:
* The ``register-branch`` command will now use the public url of the branch
containing the current directory, if one has been set and no explicit branch is provided.
(Robert Collins)
* New error ``NoPublicBranch`` for commands that need a public branch to
operate. (Robert Collins)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
bzrlib/plugins/launchpad/lp_registration.py lp_registration.py-20060315190948-daa617eafe3a8d48
bzrlib/plugins/launchpad/test_register.py test_register.py-20060315182712-40f5dda945c829a8
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
=== modified file 'NEWS'
--- a/NEWS 2008-01-23 16:25:18 +0000
+++ b/NEWS 2008-01-25 10:46:10 +0000
@@ -39,6 +39,10 @@
* The ``--coverage`` option is now global, rather specific to ``bzr
selftest``. (Andrew Bennetts)
+ * The ``register-branch`` command will now use the public url of the branch
+ containing the current directory, if one has been set and no explicit branch is provided.
+ (Robert Collins)
+
BUGFIXES:
* Calculate remote path relative to the shared medium in _SmartClient. This
@@ -82,6 +86,9 @@
``InterRepository.search_missing_revision_ids`` which returns a
``bzrlib.graph.SearchResult`` suitable for making requests from the smart
server. (Robert Collins)
+
+ * New error ``NoPublicBranch`` for commands that need a public branch to
+ operate. (Robert Collins)
* New method ``iter_inventories`` on Repository for access to many
inventories. This is primarily used by the ``revision_trees`` method, as
=== modified file 'bzrlib/errors.py'
--- a/bzrlib/errors.py 2008-01-11 05:08:20 +0000
+++ b/bzrlib/errors.py 2008-01-25 10:46:10 +0000
@@ -267,6 +267,16 @@
"record_entry_contents.")
+class NoPublicBranch(BzrError):
+
+ _fmt = 'There is no public branch set for "%(branch_url)s".'
+
+ def __init__(self, branch):
+ import bzrlib.urlutils as urlutils
+ public_location = urlutils.unescape_for_display(branch.base, 'ascii')
+ BzrError.__init__(self, branch_url=public_location)
+
+
class NoHelpTopic(BzrError):
_fmt = ("No help could be found for '%(topic)s'. "
=== modified file 'bzrlib/plugins/launchpad/__init__.py'
--- a/bzrlib/plugins/launchpad/__init__.py 2007-11-27 00:50:43 +0000
+++ b/bzrlib/plugins/launchpad/__init__.py 2008-01-25 10:46:10 +0000
@@ -21,7 +21,9 @@
# see http://bazaar-vcs.org/Specs/BranchRegistrationTool
+from bzrlib.branch import Branch
from bzrlib.commands import Command, Option, register_command
+from bzrlib.errors import BzrCommandError, NoPublicBranch, NotBranchError
from bzrlib.transport import register_lazy_transport
from bzrlib.help_topics import topic_registry
@@ -37,15 +39,19 @@
branch belongs, and create an account for yourself on launchpad.net.
arguments:
- branch_url: The publicly visible url for the branch.
- This must be an http or https url, not a local file
- path.
+ public_url: The publicly visible url for the branch.
+ This must be an http or https url (which Launchpad can read
+ from to access the branch). Local file urls, SFTP urls, and
+ bzr+ssh urls will not work.
+ If no public_url is provided, bzr will use the configured
+ public_url if there is one for the branch, and error if
+ none is configured.
example:
bzr register-branch http://foo.com/bzr/fooproduct.mine \\
--product fooproduct
"""
- takes_args = ['branch_url']
+ takes_args = ['public_url?']
takes_options = [
Option('product',
'Launchpad product short name to associate with the branch.',
@@ -71,8 +77,8 @@
]
- def run(self,
- branch_url,
+ def run(self,
+ public_url=None,
product='',
branch_name='',
branch_title='',
@@ -83,14 +89,24 @@
from bzrlib.plugins.launchpad.lp_registration import (
LaunchpadService, BranchRegistrationRequest, BranchBugLinkRequest,
DryRunLaunchpadService)
- rego = BranchRegistrationRequest(branch_url=branch_url,
+ if public_url is None:
+ try:
+ b = Branch.open_containing('.')[0]
+ except NotBranchError:
+ raise BzrCommandError('register-branch requires a public '
+ 'branch url - see bzr help register-branch.')
+ public_url = b.get_public_branch()
+ if public_url is None:
+ raise NoPublicBranch(b)
+
+ rego = BranchRegistrationRequest(branch_url=public_url,
branch_name=branch_name,
branch_title=branch_title,
branch_description=branch_description,
product_name=product,
author_email=author,
)
- linko = BranchBugLinkRequest(branch_url=branch_url,
+ linko = BranchBugLinkRequest(branch_url=public_url,
bug_id=link_bug)
if not dry_run:
service = LaunchpadService()
=== modified file 'bzrlib/plugins/launchpad/lp_registration.py'
--- a/bzrlib/plugins/launchpad/lp_registration.py 2007-11-14 15:03:18 +0000
+++ b/bzrlib/plugins/launchpad/lp_registration.py 2008-01-25 10:46:10 +0000
@@ -180,7 +180,7 @@
author_email='',
product_name='',
):
- assert branch_url
+ assert branch_url, 'branch_url %r is invalid' % branch_url
self.branch_url = branch_url
if branch_name:
self.branch_name = branch_name
=== modified file 'bzrlib/plugins/launchpad/test_register.py'
--- a/bzrlib/plugins/launchpad/test_register.py 2007-11-14 15:03:18 +0000
+++ b/bzrlib/plugins/launchpad/test_register.py 2008-01-25 10:46:10 +0000
@@ -26,7 +26,7 @@
tests,
ui,
)
-from bzrlib.tests import TestCase, TestSkipped
+from bzrlib.tests import TestCaseWithTransport, TestSkipped
# local import
from bzrlib.plugins.launchpad.lp_registration import (
@@ -129,7 +129,7 @@
self.called_authenticated = authenticated
-class TestBranchRegistration(TestCase):
+class TestBranchRegistration(TestCaseWithTransport):
SAMPLE_URL = 'http://bazaar-vcs.org/bzr/bzr.dev/'
SAMPLE_OWNER = 'jhacker at foo.com'
SAMPLE_BRANCH_ID = 'bzr.dev'
@@ -144,9 +144,26 @@
out, err = self.run_bzr(['register-branch', '--help'])
self.assertContainsRe(out, r'Register a branch')
- def test_register_no_url(self):
+ def test_register_no_url_no_branch(self):
"""register-branch command requires parameters"""
- self.run_bzr('register-branch', retcode=3)
+ self.make_repository('.')
+ self.run_bzr_error(
+ ['register-branch requires a public branch url - '
+ 'see bzr help register-branch'],
+ 'register-branch')
+
+ def test_register_no_url_in_published_branch_no_error(self):
+ b = self.make_branch('.')
+ b.set_public_branch('http://test-server.com/bzr/branch')
+ out, err = self.run_bzr(['register-branch', '--dry-run'])
+ self.assertEqual('Branch registered.\n', out)
+ self.assertEqual('', err)
+
+ def test_register_no_url_in_unpublished_branch_errors(self):
+ b = self.make_branch('.')
+ out, err = self.run_bzr_error(['no public branch'],
+ ['register-branch', '--dry-run'])
+ self.assertEqual('', out)
def test_register_dry_run(self):
out, err = self.run_bzr(['register-branch',
=== modified file 'bzrlib/tests/test_errors.py'
--- a/bzrlib/tests/test_errors.py 2008-01-02 03:08:59 +0000
+++ b/bzrlib/tests/test_errors.py 2008-01-25 10:46:10 +0000
@@ -22,6 +22,7 @@
bzrdir,
errors,
symbol_versioning,
+ urlutils,
)
from bzrlib.tests import TestCase, TestCaseWithTransport
@@ -121,7 +122,14 @@
error = errors.MediumNotConnected("a medium")
self.assertEqualDiff(
"The medium 'a medium' is not connected.", str(error))
-
+
+ def test_no_public_branch(self):
+ b = self.make_branch('.')
+ error = errors.NoPublicBranch(b)
+ url = urlutils.unescape_for_display(b.base, 'ascii')
+ self.assertEqualDiff(
+ 'There is no public branch set for "%s".' % url, str(error))
+
def test_no_repo(self):
dir = bzrdir.BzrDir.create(self.get_url())
error = errors.NoRepositoryPresent(dir)
More information about the bazaar-commits
mailing list