Merge lp:~vila/bzr/609186-shortcuts into lp:bzr

[Vincent Ladeuil]

Add ubuntu: and debianlp: shortcuts

Adding a test helper on top of Barry's proposal.

[Vincent Ladeuil (vila)]

sent to pqm by email

[Vincent Ladeuil (vila)]

sent to pqm by email

[lp:~vila/bzr/609186-shortcuts]

5469. By Vincent Ladeuil on 2010-10-11

Merge bzr.dev

5470. By Vincent Ladeuil on 2010-10-11

Fix NEWS entry

[John A Meinel (jameinel)]

sent to pqm by email

[lp:~vila/bzr/609186-shortcuts]

5471. By Vincent Ladeuil on 2010-10-11

Merge bzr.dev again

[Vincent Ladeuil (vila)]

Help needed !
It seems that pqm fails some tests (I briefly saw in a summary ~36 failures mentioned) but the email can't reach me. Investigating with a losa seem to point at my ISP marking it as spam :(

I can reproduce the failures even on the hardy babune slave, so I need someone else to feed-pqm this and forward me the pqm email on my canonical address (<my nick> at canonical <dot> com).

Thanks in advance !

If you get a 'Conflict in NEWS' error, that's not the one I'm after, it just means someone landed some more stuff. I just remerge against trunk though so it shouldn't occur again.

[Martin Pool (mbp)]

sent to pqm by email

[Martin Pool (mbp)]

I resolved the conflicts in
https://code.edge.launchpad.net/~mbp/bzr/integration/+merge/38166 and
I'll let you know if there are any errors.

[Martin Pool (mbp)]

There are multiple failures like this:

Traceback (most recent call last):
 File "/usr/lib/python2.4/site-packages/testtools/runtest.py", line 128, in _run_user
   return fn(*args)
 File "/usr/lib/python2.4/site-packages/testtools/testcase.py", line 368, in _run_test_method
   testMethod()
 File "/home/pqm/bzr-pqm-workdir/home/+trunk/bzrlib/plugins/launchpad/test_lp_directory.py", line 466, in test_ubuntu_d_distroseries_expansion
   self.assertURL('ubuntu/dapper/foo', 'ubuntu:d/foo', series='dapper')
 File "/home/pqm/bzr-pqm-workdir/home/+trunk/bzrlib/plugins/launchpad/test_lp_directory.py", line 383, in assertURL
   self.directory._resolve(shortcut, factory))
 File "/home/pqm/bzr-pqm-workdir/home/+trunk/bzrlib/plugins/launchpad/lp_directory.py", line 77, in _resolve
   if result.scheme in ('ubuntu', 'debianlp'):
AttributeError: 'tuple' object has no attribute 'scheme'

[lp:~vila/bzr/609186-shortcuts]

5472. By Vincent Ladeuil on 2010-10-12

Fix python2.4 compatibility.

[Vincent Ladeuil (vila)]

Bah, the babune slave doesn't force the use of python2.4 so I was on the wrong track.

@barry: You will copy 100 times: bzr should remain compatible with python2.4 OR send me a beer ;)

[Vincent Ladeuil (vila)]

sent to pqm by email

=== modified file 'NEWS'
--- NEWS	2010-10-12 07:24:49 +0000
+++ NEWS	2010-10-12 07:24:50 +0000
@@ -16,6 +16,13 @@
 New Features
 ************
 
+* New shortcut url schemes ``ubuntu:`` and ``debianlp:`` access source
+  branches on Launchpad.  E.g. ``bzr branch ubuntu:foo`` gives you the source
+  branch for project ``foo`` in the current distroseries for Ubuntu while
+  ``bzr branch debianlp:lenny/foo`` gives you the source branch (on Launchpad)
+  for project ``foo`` in Debian Lenny.
+  (Barry Warsaw, #609186)
+
 * Provide a configuration option "default_format" that controls the
   default format for new branches created with ``bzr init``.
   (Neil Martinsen-Burrell, #484101)
@@ -66,13 +73,6 @@
 New Features
 ************
 
-* New shortcut url schemes ``ubuntu:`` and ``debianlp:`` access source
-  branches on Launchpad.  E.g. ``bzr branch ubuntu:foo`` gives you the source
-  branch for project ``foo`` in the current distroseries for Ubuntu while
-  ``bzr branch debianlp:lenny/foo`` gives you the source branch (on Launchpad)
-  for project ``foo`` in Debian Lenny.
-  (Barry Warsaw, #609186)
-
 * Add ``mainline`` revision specifier, which selects the revision that
   merged a specified revision into the mainline.  (Aaron Bentley)
 

=== modified file 'bzrlib/plugins/launchpad/lp_directory.py'
--- bzrlib/plugins/launchpad/lp_directory.py	2010-10-12 07:24:49 +0000
+++ bzrlib/plugins/launchpad/lp_directory.py	2010-10-12 07:24:50 +0000
@@ -73,12 +73,12 @@
                  _lp_login=None):
         """Resolve the base URL for this transport."""
         # Do ubuntu: and debianlp: expansions.
-        result = urlsplit(url)
-        if result.scheme in ('ubuntu', 'debianlp'):
-            if result.scheme == 'ubuntu':
+        scheme, netloc, path, query, fragment = urlsplit(url)
+        if scheme in ('ubuntu', 'debianlp'):
+            if scheme == 'ubuntu':
                 distro = 'ubuntu'
                 distro_series = _ubuntu_series_shortcuts
-            elif result.scheme == 'debianlp':
+            elif scheme == 'debianlp':
                 distro = 'debian'
                 # No shortcuts for Debian distroseries.
                 distro_series = {}
@@ -87,7 +87,7 @@
             # Split the path.  It's either going to be 'project' or
             # 'series/project', but recognize that it may be a series we don't
             # know about.
-            path_parts = result.path.split('/')
+            path_parts = path.split('/')
             if len(path_parts) == 1:
                 # It's just a project name.
                 lp_url_template = 'lp:%(distro)s/%(project)s'
@@ -108,11 +108,11 @@
                 distro=distro,
                 series=series,
                 project=project)
-            result = urlsplit(url)
+            scheme, netloc, path, query, fragment = urlsplit(url)
         service = LaunchpadService.for_url(url)
         if _lp_login is None:
             _lp_login = get_lp_login()
-        path = result[2].strip('/')
+        path = path.strip('/')
         if path.startswith('~/'):
             if _lp_login is None:
                 raise errors.InvalidURL(path=url,

=== modified file 'bzrlib/plugins/launchpad/test_lp_directory.py'
--- bzrlib/plugins/launchpad/test_lp_directory.py	2010-10-12 07:24:49 +0000
+++ bzrlib/plugins/launchpad/test_lp_directory.py	2010-10-12 07:24:50 +0000
@@ -375,6 +375,13 @@
             self, path, dict(urls=[
                 'http://bazaar.launchpad.net/' + url_suffix]))
 
+    def assertURL(self, expected_url, shortcut, package='foo', distro='ubuntu',
+                  series=None):
+        factory = self._make_factory(package=package, distro=distro,
+                                     series=series)
+        self.assertEqual('http://bazaar.launchpad.net/~branch/' + expected_url,
+                         self.directory._resolve(shortcut, factory))
+
     # Bogus distro.
 
     def test_bogus_distro(self):
@@ -392,137 +399,81 @@
     def test_missing_ubuntu_distroseries_without_project(self):
         # Launchpad does not hold source packages for Intrepid.  Missing or
         # bogus distroseries with no project name is treated like a project.
-        factory = self._make_factory(package='intrepid')
-        self.assertEqual(
-            'http://bazaar.launchpad.net/~branch/ubuntu/intrepid',
-            self.directory._resolve('ubuntu:intrepid', factory))
+        self.assertURL('ubuntu/intrepid', 'ubuntu:intrepid', package='intrepid')
 
     def test_missing_ubuntu_distroseries_with_project(self):
         # Launchpad does not hold source packages for Intrepid.  Missing or
         # bogus distroseries with a project name is treated like an unknown
         # series (i.e. we keep it verbatim).
-        factory = self._make_factory(series='intrepid')
-        self.assertEqual(
-            'http://bazaar.launchpad.net/~branch/ubuntu/intrepid/foo',
-            self.directory._resolve('ubuntu:intrepid/foo', factory))
+        self.assertURL('ubuntu/intrepid/foo',
+                       'ubuntu:intrepid/foo', series='intrepid')
 
     def test_missing_debian_distroseries(self):
         # Launchpad does not hold source packages for unstable.  Missing or
         # bogus distroseries is treated like a project.
-        factory = self._make_factory(package='sid', distro='debian')
-        self.assertEqual(
-            'http://bazaar.launchpad.net/~branch/debian/sid',
-            self.directory._resolve('debianlp:sid', factory))
+        self.assertURL('debian/sid',
+                       'debianlp:sid', package='sid', distro='debian')
 
     # Ubuntu Default distro series.
 
     def test_ubuntu_default_distroseries_expansion(self):
-        factory = self._make_factory(package='foo')
-        self.assertEqual('http://bazaar.launchpad.net/~branch/ubuntu/foo',
-                         self.directory._resolve('ubuntu:foo', factory)),
+        self.assertURL('ubuntu/foo', 'ubuntu:foo')
 
     def test_ubuntu_natty_distroseries_expansion(self):
-        factory = self._make_factory(package='foo', series='natty')
-        self.assertEqual(
-            'http://bazaar.launchpad.net/~branch/ubuntu/natty/foo',
-            self.directory._resolve('ubuntu:natty/foo', factory)),
+        self.assertURL('ubuntu/natty/foo', 'ubuntu:natty/foo', series='natty')
 
     def test_ubuntu_n_distroseries_expansion(self):
-        factory = self._make_factory(package='foo', series='natty')
-        self.assertEqual(
-            'http://bazaar.launchpad.net/~branch/ubuntu/natty/foo',
-            self.directory._resolve('ubuntu:n/foo', factory)),
+        self.assertURL('ubuntu/natty/foo', 'ubuntu:n/foo', series='natty')
 
     def test_ubuntu_maverick_distroseries_expansion(self):
-        factory = self._make_factory(package='foo', series='maverick')
-        self.assertEqual(
-            'http://bazaar.launchpad.net/~branch/ubuntu/maverick/foo',
-            self.directory._resolve('ubuntu:maverick/foo', factory)),
+        self.assertURL('ubuntu/maverick/foo', 'ubuntu:maverick/foo',
+                       series='maverick')
 
     def test_ubuntu_m_distroseries_expansion(self):
-        factory = self._make_factory(package='foo', series='maverick')
-        self.assertEqual(
-            'http://bazaar.launchpad.net/~branch/ubuntu/maverick/foo',
-            self.directory._resolve('ubuntu:m/foo', factory)),
+        self.assertURL('ubuntu/maverick/foo', 'ubuntu:m/foo', series='maverick')
 
     def test_ubuntu_lucid_distroseries_expansion(self):
-        factory = self._make_factory(package='foo', series='lucid')
-        self.assertEqual(
-            'http://bazaar.launchpad.net/~branch/ubuntu/lucid/foo',
-            self.directory._resolve('ubuntu:lucid/foo', factory)),
+        self.assertURL('ubuntu/lucid/foo', 'ubuntu:lucid/foo', series='lucid')
 
     def test_ubuntu_l_distroseries_expansion(self):
-        factory = self._make_factory(package='foo', series='lucid')
-        self.assertEqual(
-            'http://bazaar.launchpad.net/~branch/ubuntu/lucid/foo',
-            self.directory._resolve('ubuntu:l/foo', factory)),
+        self.assertURL('ubuntu/lucid/foo', 'ubuntu:l/foo', series='lucid')
 
     def test_ubuntu_karmic_distroseries_expansion(self):
-        factory = self._make_factory(package='foo', series='karmic')
-        self.assertEqual(
-            'http://bazaar.launchpad.net/~branch/ubuntu/karmic/foo',
-            self.directory._resolve('ubuntu:karmic/foo', factory)),
+        self.assertURL('ubuntu/karmic/foo', 'ubuntu:karmic/foo',
+                       series='karmic')
 
     def test_ubuntu_k_distroseries_expansion(self):
-        factory = self._make_factory(package='foo', series='karmic')
-        self.assertEqual(
-            'http://bazaar.launchpad.net/~branch/ubuntu/karmic/foo',
-            self.directory._resolve('ubuntu:k/foo', factory)),
+        self.assertURL('ubuntu/karmic/foo', 'ubuntu:k/foo', series='karmic')
 
     def test_ubuntu_jaunty_distroseries_expansion(self):
-        factory = self._make_factory(package='foo', series='jaunty')
-        self.assertEqual(
-            'http://bazaar.launchpad.net/~branch/ubuntu/jaunty/foo',
-            self.directory._resolve('ubuntu:jaunty/foo', factory)),
+        self.assertURL('ubuntu/jaunty/foo', 'ubuntu:jaunty/foo',
+                       series='jaunty')
 
     def test_ubuntu_j_distroseries_expansion(self):
-        factory = self._make_factory(package='foo', series='jaunty')
-        self.assertEqual(
-            'http://bazaar.launchpad.net/~branch/ubuntu/jaunty/foo',
-            self.directory._resolve('ubuntu:j/foo', factory)),
+        self.assertURL('ubuntu/jaunty/foo', 'ubuntu:j/foo', series='jaunty')
 
     def test_ubuntu_hardy_distroseries_expansion(self):
-        factory = self._make_factory(package='foo', series='hardy')
-        self.assertEqual(
-            'http://bazaar.launchpad.net/~branch/ubuntu/hardy/foo',
-            self.directory._resolve('ubuntu:hardy/foo', factory)),
+        self.assertURL('ubuntu/hardy/foo', 'ubuntu:hardy/foo', series='hardy')
 
     def test_ubuntu_h_distroseries_expansion(self):
-        factory = self._make_factory(package='foo', series='hardy')
-        self.assertEqual(
-            'http://bazaar.launchpad.net/~branch/ubuntu/hardy/foo',
-            self.directory._resolve('ubuntu:h/foo', factory)),
+        self.assertURL('ubuntu/hardy/foo', 'ubuntu:h/foo', series='hardy')
 
     def test_ubuntu_dapper_distroseries_expansion(self):
-        factory = self._make_factory(package='foo', series='dapper')
-        self.assertEqual(
-            'http://bazaar.launchpad.net/~branch/ubuntu/dapper/foo',
-            self.directory._resolve('ubuntu:dapper/foo', factory)),
+        self.assertURL('ubuntu/dapper/foo', 'ubuntu:dapper/foo',
+                       series='dapper')
 
     def test_ubuntu_d_distroseries_expansion(self):
-        factory = self._make_factory(package='foo', series='dapper')
-        self.assertEqual(
-            'http://bazaar.launchpad.net/~branch/ubuntu/dapper/foo',
-            self.directory._resolve('ubuntu:d/foo', factory)),
+        self.assertURL('ubuntu/dapper/foo', 'ubuntu:d/foo', series='dapper')
 
     # Debian default distro series.
 
     def test_debian_default_distroseries_expansion(self):
-        factory = self._make_factory(package='foo', distro='debian')
-        self.assertEqual(
-            'http://bazaar.launchpad.net/~branch/debian/foo',
-            self.directory._resolve('debianlp:foo', factory))
+        self.assertURL('debian/foo', 'debianlp:foo', distro='debian')
 
     def test_debian_squeeze_distroseries_expansion(self):
-        factory = self._make_factory(
-            package='foo', distro='debian', series='squeeze')
-        self.assertEqual(
-            'http://bazaar.launchpad.net/~branch/debian/squeeze/foo',
-            self.directory._resolve('debianlp:squeeze/foo', factory)),
+        self.assertURL('debian/squeeze/foo', 'debianlp:squeeze/foo',
+                       distro='debian', series='squeeze')
 
     def test_debian_lenny_distroseries_expansion(self):
-        factory = self._make_factory(
-            package='foo', distro='debian', series='lenny')
-        self.assertEqual(
-            'http://bazaar.launchpad.net/~branch/debian/lenny/foo',
-            self.directory._resolve('debianlp:lenny/foo', factory)),
+        self.assertURL('debian/lenny/foo', 'debianlp:lenny/foo',
+                       distro='debian', series='lenny')