Rev 2250: Add short-form lp:PRODUCT url form in file:///home/mbp/bzr/Work/lpurl/

[Martin Pool]

------------------------------------------------------------
revno: 2250
revision-id: mbp at sourcefrog.net-20070126031150-80cjzqt6e3f64b2m
parent: mbp at sourcefrog.net-20070126030508-s5im2cxv57xqk7pu
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: lpurl
timestamp: Fri 2007-01-26 14:11:50 +1100
message:
  Add short-form lp:PRODUCT url form
modified:
  bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
  bzrlib/plugins/launchpad/lp_indirect.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
  bzrlib/plugins/launchpad/test_lp_indirect.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
=== modified file 'bzrlib/plugins/launchpad/__init__.py'
--- a/bzrlib/plugins/launchpad/__init__.py	2007-01-26 03:05:08 +0000
+++ b/bzrlib/plugins/launchpad/__init__.py	2007-01-26 03:11:50 +0000
@@ -122,6 +122,11 @@
 register_command(cmd_register_branch)
 
 register_lazy_transport(
+    'lp:',
+    'bzrlib.plugins.launchpad.lp_indirect',
+    'launchpad_transport_indirect')
+
+register_lazy_transport(
     'lp://',
     'bzrlib.plugins.launchpad.lp_indirect',
     'launchpad_transport_indirect')

=== modified file 'bzrlib/plugins/launchpad/lp_indirect.py'
--- a/bzrlib/plugins/launchpad/lp_indirect.py	2007-01-26 03:05:08 +0000
+++ b/bzrlib/plugins/launchpad/lp_indirect.py	2007-01-26 03:11:50 +0000
@@ -35,6 +35,8 @@
     """Factory that returns the real transport for a lp: url"""
     if base_url.startswith('lp:///'):
         real_url = 'http://code.launchpad.net/' + base_url[6:]
+    elif base_url.startswith('lp:') and base_url[3] != '/':
+        real_url = 'http://code.launchpad.net/' + base_url[3:]
     else:
         raise errors.InvalidURL(path=base_url)
     return get_transport(real_url)

=== modified file 'bzrlib/plugins/launchpad/test_lp_indirect.py'
--- a/bzrlib/plugins/launchpad/test_lp_indirect.py	2007-01-26 03:05:08 +0000
+++ b/bzrlib/plugins/launchpad/test_lp_indirect.py	2007-01-26 03:11:50 +0000
@@ -25,6 +25,12 @@
 
 class IndirectUrlTests(TestCase):
 
+    def test_short_form(self):
+        """A launchpad url should map to a http url"""
+        url = 'lp:apt'
+        t = get_transport(url)
+        self.assertEquals(t.base, 'http://code.launchpad.net/apt/')
+
     def test_indirect_through_url(self):
         """A launchpad url should map to a http url"""
         # These can change to use the smartserver protocol or something