Merge lp:~jelmer/brz/lpbzr into lp:brz

Proposed by Jelmer Vernooij on 2019-01-17
Status: Merged
Approved by: Jelmer Vernooij on 2019-02-02
Approved revision: 7242
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~jelmer/brz/lpbzr
Merge into: lp:brz
Diff against target: 70 lines (+14/-0)
4 files modified
breezy/plugins/launchpad/__init__.py (+3/-0)
breezy/plugins/launchpad/lp_directory.py (+3/-0)
breezy/plugins/launchpad/test_lp_directory.py (+5/-0)
doc/en/release-notes/brz-3.0.txt (+3/-0)
To merge this branch: bzr merge lp:~jelmer/brz/lpbzr
Reviewer Review Type Date Requested Status
Martin Packman 2019-01-17 Approve on 2019-02-02
Review via email: mp+361858@code.launchpad.net

Commit message

Add a lp+bzr URL scheme for looking up Bazaar-only branches.

Description of the change

Add a lp+bzr URL scheme for looking up Bazaar-only branches.

This ahead of adding a lp+git scheme, and making lp:// support either.

To post a comment you must log in.
Martin Packman (gz) wrote :

Don't have a diff/change here.

Martin Packman (gz) wrote :

Okay, makes sense. Conflicts to resolve, but trivial.

review: Approve
lp:~jelmer/brz/lpbzr updated on 2019-02-02
7242. By Jelmer Vernooij on 2019-02-02

Merge trunk.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'breezy/plugins/launchpad/__init__.py'
2--- breezy/plugins/launchpad/__init__.py 2019-01-27 19:54:39 +0000
3+++ breezy/plugins/launchpad/__init__.py 2019-02-02 22:24:27 +0000
4@@ -73,6 +73,9 @@
5 directories.register_lazy('lp:', 'breezy.plugins.launchpad.lp_directory',
6 'LaunchpadDirectory',
7 'Launchpad-based directory service',)
8+ directories.register_lazy('lp+bzr:', 'breezy.plugins.launchpad.lp_directory',
9+ 'LaunchpadDirectory',
10+ 'Bazaar-specific Launchpad directory service',)
11 directories.register_lazy(
12 'debianlp:', 'breezy.plugins.launchpad.lp_directory',
13 'LaunchpadDirectory',
14
15=== modified file 'breezy/plugins/launchpad/lp_directory.py'
16--- breezy/plugins/launchpad/lp_directory.py 2019-01-18 01:37:08 +0000
17+++ breezy/plugins/launchpad/lp_directory.py 2019-02-02 22:24:27 +0000
18@@ -51,6 +51,7 @@
19 # is counted as a netloc protocol.
20 transport.register_urlparse_netloc_protocol('bzr+ssh')
21 transport.register_urlparse_netloc_protocol('lp')
22+transport.register_urlparse_netloc_protocol('lp+bzr')
23
24
25 def _requires_launchpad_login(scheme, netloc, path, query,
26@@ -109,6 +110,8 @@
27 series=series,
28 project=project)
29 scheme, netloc, path, query, fragment = urlsplit(url)
30+ elif scheme == 'lp+bzr':
31+ scheme = 'lp'
32 return url, path
33
34
35
36=== modified file 'breezy/plugins/launchpad/test_lp_directory.py'
37--- breezy/plugins/launchpad/test_lp_directory.py 2018-11-16 11:37:47 +0000
38+++ breezy/plugins/launchpad/test_lp_directory.py 2019-02-02 22:24:27 +0000
39@@ -105,6 +105,10 @@
40 self.assertResolve('bzr+ssh://bazaar.launchpad.net/+branch/apt',
41 'lp:apt')
42
43+ def test_short_form_bzr(self):
44+ self.assertResolve('bzr+ssh://bazaar.launchpad.net/+branch/apt',
45+ 'lp+bzr:apt')
46+
47 def test_two_part_form(self):
48 self.assertResolve('bzr+ssh://bazaar.launchpad.net/+branch/apt/2.2',
49 'lp:apt/2.2')
50@@ -399,6 +403,7 @@
51 return '!unexpected look_up value!'
52
53 directories.remove('lp:')
54+ directories.remove('lp+bzr:')
55 directories.remove('ubuntu:')
56 directories.remove('debianlp:')
57 directories.register('lp:', FooService, 'Map lp URLs to local urls')
58
59=== modified file 'doc/en/release-notes/brz-3.0.txt'
60--- doc/en/release-notes/brz-3.0.txt 2019-01-27 19:54:39 +0000
61+++ doc/en/release-notes/brz-3.0.txt 2019-02-02 22:24:27 +0000
62@@ -151,6 +151,9 @@
63 ``RevisionTree.annotate_iter`` have been added. (Jelmer Vernooij,
64 #897781)
65
66+ * New ``lp+bzr://`` URL scheme for Bazaar-only branches on Launchpad.
67+ (Jelmer Vernooij)
68+
69 * Report colocated branch information in ``brz info``.
70 (Jelmer Vernooij, #1803846)
71

Subscribers

People subscribed via source and target branches