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

[Jelmer Vernooij]

Drop support for ubuntu:X/package shortcuts, where X is a single letter representing a Ubuntu release.

Drop support for ubuntu:X/package shortcuts, where X is a single letter representing a Ubuntu release.

Bazaar's dict of these mappings was static and had not been updated since natty. There is now also
ambiguity in these mappings, since we have both "dapper" and "disco". Depending on the version
of Bazaar/Breezy you're running this could resolve to either one.

[Martin Packman (gz)]

Thanks!

review: Approve

=== modified file 'breezy/plugins/launchpad/lp_directory.py'
--- breezy/plugins/launchpad/lp_directory.py	2018-08-01 21:10:58 +0000
+++ breezy/plugins/launchpad/lp_directory.py	2018-11-13 02:34:01 +0000
@@ -48,16 +48,6 @@
 transport.register_urlparse_netloc_protocol('bzr+ssh')
 transport.register_urlparse_netloc_protocol('lp')
 
-_ubuntu_series_shortcuts = {
-    'n': 'natty',
-    'm': 'maverick',
-    'l': 'lucid',
-    'k': 'karmic',
-    'j': 'jaunty',
-    'h': 'hardy',
-    'd': 'dapper',
-    }
-
 
 class LaunchpadDirectory(object):
 
@@ -118,11 +108,9 @@
         if scheme in ('ubuntu', 'debianlp'):
             if scheme == 'ubuntu':
                 distro = 'ubuntu'
-                distro_series = _ubuntu_series_shortcuts
             elif scheme == 'debianlp':
                 distro = 'debian'
                 # No shortcuts for Debian distroseries.
-                distro_series = {}
             else:
                 raise AssertionError('scheme should be ubuntu: or debianlp:')
             # Split the path.  It's either going to be 'project' or
@@ -142,8 +130,6 @@
                 # There are either 0 or > 2 path parts, neither of which is
                 # supported for these schemes.
                 raise InvalidURL('Bad path: %s' % url)
-            # Expand any series shortcuts, but keep unknown series.
-            series = distro_series.get(series, series)
             # Hack the url and let the following do the final resolution.
             url = lp_url_template % dict(
                 distro=distro,

=== modified file 'breezy/plugins/launchpad/test_lp_directory.py'
--- breezy/plugins/launchpad/test_lp_directory.py	2018-08-01 21:10:58 +0000
+++ breezy/plugins/launchpad/test_lp_directory.py	2018-11-13 02:34:01 +0000
@@ -594,49 +594,28 @@
     def test_ubuntu_natty_distroseries_expansion(self):
         self.assertURL('ubuntu/natty/foo', 'ubuntu:natty/foo', series='natty')
 
-    def test_ubuntu_n_distroseries_expansion(self):
-        self.assertURL('ubuntu/natty/foo', 'ubuntu:n/foo', series='natty')
-
     def test_ubuntu_maverick_distroseries_expansion(self):
         self.assertURL('ubuntu/maverick/foo', 'ubuntu:maverick/foo',
                        series='maverick')
 
-    def test_ubuntu_m_distroseries_expansion(self):
-        self.assertURL('ubuntu/maverick/foo', 'ubuntu:m/foo', series='maverick')
-
     def test_ubuntu_lucid_distroseries_expansion(self):
         self.assertURL('ubuntu/lucid/foo', 'ubuntu:lucid/foo', series='lucid')
 
-    def test_ubuntu_l_distroseries_expansion(self):
-        self.assertURL('ubuntu/lucid/foo', 'ubuntu:l/foo', series='lucid')
-
     def test_ubuntu_karmic_distroseries_expansion(self):
         self.assertURL('ubuntu/karmic/foo', 'ubuntu:karmic/foo',
                        series='karmic')
 
-    def test_ubuntu_k_distroseries_expansion(self):
-        self.assertURL('ubuntu/karmic/foo', 'ubuntu:k/foo', series='karmic')
-
     def test_ubuntu_jaunty_distroseries_expansion(self):
         self.assertURL('ubuntu/jaunty/foo', 'ubuntu:jaunty/foo',
                        series='jaunty')
 
-    def test_ubuntu_j_distroseries_expansion(self):
-        self.assertURL('ubuntu/jaunty/foo', 'ubuntu:j/foo', series='jaunty')
-
     def test_ubuntu_hardy_distroseries_expansion(self):
         self.assertURL('ubuntu/hardy/foo', 'ubuntu:hardy/foo', series='hardy')
 
-    def test_ubuntu_h_distroseries_expansion(self):
-        self.assertURL('ubuntu/hardy/foo', 'ubuntu:h/foo', series='hardy')
-
     def test_ubuntu_dapper_distroseries_expansion(self):
         self.assertURL('ubuntu/dapper/foo', 'ubuntu:dapper/foo',
                        series='dapper')
 
-    def test_ubuntu_d_distroseries_expansion(self):
-        self.assertURL('ubuntu/dapper/foo', 'ubuntu:d/foo', series='dapper')
-
     # Debian default distro series.
 
     def test_debian_default_distroseries_expansion(self):

=== modified file 'doc/en/release-notes/brz-3.0.txt'
--- doc/en/release-notes/brz-3.0.txt	2018-09-18 02:08:46 +0000
+++ doc/en/release-notes/brz-3.0.txt	2018-11-13 02:34:01 +0000
@@ -67,6 +67,11 @@
    has been renamed to ``transform.orphan_policy``.
    (Jelmer Vernooij)
 
+ * One-letter shortcuts for Ubuntu releases are no
+   longer supported after 'ubuntu:'. Bazaar's mapping for
+   one-letter distroseries had not been updated since natty.
+   (Jelmer Vernooij)
+
 New Features
 ************