bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
|
5609.24.7
by John Arbash Meinel
Fix bug #397739. Avoid doing an XMLRPC lookup if a user |
1 |
# Copyright (C) 2007-2011 Canonical Ltd
|
|
2245.8.3
by Martin Pool
Start adding indirection transport |
2 |
#
|
3 |
# This program is free software; you can redistribute it and/or modify
|
|
4 |
# it under the terms of the GNU General Public License as published by
|
|
5 |
# the Free Software Foundation; either version 2 of the License, or
|
|
6 |
# (at your option) any later version.
|
|
7 |
#
|
|
8 |
# This program is distributed in the hope that it will be useful,
|
|
9 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
10 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
11 |
# GNU General Public License for more details.
|
|
12 |
#
|
|
13 |
# You should have received a copy of the GNU General Public License
|
|
14 |
# along with this program; if not, write to the Free Software
|
|
|
4183.7.1
by Sabin Iacob
update FSF mailing address |
15 |
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
2245.8.3
by Martin Pool
Start adding indirection transport |
16 |
|
|
6379.6.7
by Jelmer Vernooij
Move importing from future until after doc string, otherwise the doc string will disappear. |
17 |
"""Directory lookup that uses Launchpad."""
|
18 |
||
|
6379.6.3
by Jelmer Vernooij
Use absolute_import. |
19 |
from __future__ import absolute_import |
|
2245.8.3
by Martin Pool
Start adding indirection transport |
20 |
|
|
5121.2.1
by Jelmer Vernooij
Remove unused imports in lp_directory. |
21 |
from urlparse import urlsplit |
|
2898.4.4
by James Henstridge
Changes to account for modifications to the XMLRPC API. |
22 |
import xmlrpclib |
23 |
||
|
6624
by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes') |
24 |
from ... import ( |
|
2898.4.14
by James Henstridge
* Use urlsplit() to process URLs. |
25 |
debug, |
|
2245.8.4
by Martin Pool
lp:/// indirection works |
26 |
errors, |
|
2898.4.14
by James Henstridge
* Use urlsplit() to process URLs. |
27 |
trace, |
|
5609.9.1
by Martin
Blindly change all users of get_transport to address the function via the transport module |
28 |
transport, |
|
2245.8.4
by Martin Pool
lp:/// indirection works |
29 |
)
|
|
6624
by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes') |
30 |
from ...i18n import gettext |
|
2245.8.4
by Martin Pool
lp:/// indirection works |
31 |
|
|
6624
by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes') |
32 |
from .lp_registration import ( |
|
6729.6.1
by Jelmer Vernooij
Move urlutils errors. |
33 |
InvalidURL, |
34 |
LaunchpadService, |
|
35 |
ResolveLaunchpadPathRequest, |
|
36 |
)
|
|
|
6624
by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes') |
37 |
from .account import get_lp_login |
|
6622.1.34
by Jelmer Vernooij
Rename brzlib => breezy. |
38 |
|
39 |
||
40 |
# As breezy.transport.remote may not be loaded yet, make sure bzr+ssh
|
|
|
2898.4.9
by James Henstridge
Add some more tests for the bzr+ssh://bazaar.launchpad.net URL |
41 |
# is counted as a netloc protocol.
|
|
5609.9.1
by Martin
Blindly change all users of get_transport to address the function via the transport module |
42 |
transport.register_urlparse_netloc_protocol('bzr+ssh') |
43 |
transport.register_urlparse_netloc_protocol('lp') |
|
|
2898.4.9
by James Henstridge
Add some more tests for the bzr+ssh://bazaar.launchpad.net URL |
44 |
|
|
5462.4.5
by Barry Warsaw
We only need to include distroseries shortcuts. |
45 |
_ubuntu_series_shortcuts = { |
|
5462.4.3
by Barry Warsaw
* Add back Ubuntu distroseries shortcuts. |
46 |
'n': 'natty', |
47 |
'm': 'maverick', |
|
48 |
'l': 'lucid', |
|
49 |
'k': 'karmic', |
|
50 |
'j': 'jaunty', |
|
51 |
'h': 'hardy', |
|
52 |
'd': 'dapper', |
|
|
5462.4.1
by Barry Warsaw
Added support for ubuntu: and debianlp: schemes, accessing the relevant |
53 |
}
|
54 |
||
|
2898.4.9
by James Henstridge
Add some more tests for the bzr+ssh://bazaar.launchpad.net URL |
55 |
|
|
3251.4.1
by Aaron Bentley
Convert LP transport into directory service |
56 |
class LaunchpadDirectory(object): |
|
2898.4.8
by James Henstridge
Switch lp: over to a pass-through transport, so that the XMLRPC gets |
57 |
|
|
3031.2.4
by jml at canonical
Only split the URL once. |
58 |
def _requires_launchpad_login(self, scheme, netloc, path, query, |
59 |
fragment): |
|
60 |
"""Does the URL require a Launchpad login in order to be reached? |
|
61 |
||
62 |
The URL is specified by its parsed components, as returned from
|
|
63 |
urlsplit.
|
|
64 |
"""
|
|
|
3031.2.3
by jml at canonical
Make the test pass -- don't include sftp URLs if there's no lp login. |
65 |
return (scheme in ('bzr+ssh', 'sftp') |
66 |
and (netloc.endswith('launchpad.net') |
|
67 |
or netloc.endswith('launchpad.dev'))) |
|
|
3031.2.1
by jml at canonical
Factor out the method that determines if a URL is a LP url. |
68 |
|
|
3251.4.1
by Aaron Bentley
Convert LP transport into directory service |
69 |
def look_up(self, name, url): |
|
3251.4.5
by Aaron Bentley
Add docstring |
70 |
"""See DirectoryService.look_up""" |
|
3251.4.1
by Aaron Bentley
Convert LP transport into directory service |
71 |
return self._resolve(url) |
72 |
||
|
5609.24.9
by John Arbash Meinel
A bunch more tests and bug fixes for the local resolution. |
73 |
def _resolve_locally(self, path, url, _request_factory): |
74 |
# This is the best I could work out about XMLRPC. If an lp: url
|
|
75 |
# includes ~user, then it is specially validated. Otherwise, it is just
|
|
76 |
# sent to +branch/$path.
|
|
77 |
_, netloc, _, _, _ = urlsplit(url) |
|
78 |
if netloc == '': |
|
79 |
netloc = LaunchpadService.DEFAULT_INSTANCE |
|
80 |
base_url = LaunchpadService.LAUNCHPAD_DOMAINS[netloc] |
|
81 |
base = 'bzr+ssh://bazaar.%s/' % (base_url,) |
|
82 |
maybe_invalid = False |
|
83 |
if path.startswith('~'): |
|
84 |
# A ~user style path, validate it a bit.
|
|
85 |
# If a path looks fishy, fall back to asking XMLRPC to
|
|
86 |
# resolve it for us. That way we still get their nicer error
|
|
87 |
# messages.
|
|
88 |
parts = path.split('/') |
|
89 |
if (len(parts) < 3 |
|
90 |
or (parts[1] in ('ubuntu', 'debian') and len(parts) < 5)): |
|
91 |
# This special case requires 5-parts to be valid.
|
|
92 |
maybe_invalid = True |
|
93 |
else: |
|
94 |
base += '+branch/' |
|
95 |
if maybe_invalid: |
|
96 |
return self._resolve_via_xmlrpc(path, url, _request_factory) |
|
97 |
return {'urls': [base + path]} |
|
|
5609.24.7
by John Arbash Meinel
Fix bug #397739. Avoid doing an XMLRPC lookup if a user |
98 |
|
99 |
def _resolve_via_xmlrpc(self, path, url, _request_factory): |
|
100 |
service = LaunchpadService.for_url(url) |
|
101 |
resolve = _request_factory(path) |
|
102 |
try: |
|
103 |
result = resolve.submit(service) |
|
|
6619.3.2
by Jelmer Vernooij
Apply 2to3 except fix. |
104 |
except xmlrpclib.Fault as fault: |
|
6729.6.1
by Jelmer Vernooij
Move urlutils errors. |
105 |
raise InvalidURL( |
|
5609.24.7
by John Arbash Meinel
Fix bug #397739. Avoid doing an XMLRPC lookup if a user |
106 |
path=url, extra=fault.faultString) |
107 |
return result |
|
108 |
||
109 |
def _update_url_scheme(self, url): |
|
|
5462.4.1
by Barry Warsaw
Added support for ubuntu: and debianlp: schemes, accessing the relevant |
110 |
# Do ubuntu: and debianlp: expansions.
|
|
5462.4.10
by Vincent Ladeuil
Fix python2.4 compatibility. |
111 |
scheme, netloc, path, query, fragment = urlsplit(url) |
112 |
if scheme in ('ubuntu', 'debianlp'): |
|
113 |
if scheme == 'ubuntu': |
|
|
5462.4.1
by Barry Warsaw
Added support for ubuntu: and debianlp: schemes, accessing the relevant |
114 |
distro = 'ubuntu' |
|
5462.4.5
by Barry Warsaw
We only need to include distroseries shortcuts. |
115 |
distro_series = _ubuntu_series_shortcuts |
|
5462.4.10
by Vincent Ladeuil
Fix python2.4 compatibility. |
116 |
elif scheme == 'debianlp': |
|
5462.4.1
by Barry Warsaw
Added support for ubuntu: and debianlp: schemes, accessing the relevant |
117 |
distro = 'debian' |
|
5462.4.5
by Barry Warsaw
We only need to include distroseries shortcuts. |
118 |
# No shortcuts for Debian distroseries.
|
119 |
distro_series = {} |
|
|
5462.4.1
by Barry Warsaw
Added support for ubuntu: and debianlp: schemes, accessing the relevant |
120 |
else: |
121 |
raise AssertionError('scheme should be ubuntu: or debianlp:') |
|
|
5462.4.3
by Barry Warsaw
* Add back Ubuntu distroseries shortcuts. |
122 |
# Split the path. It's either going to be 'project' or
|
123 |
# 'series/project', but recognize that it may be a series we don't
|
|
124 |
# know about.
|
|
|
5462.4.10
by Vincent Ladeuil
Fix python2.4 compatibility. |
125 |
path_parts = path.split('/') |
|
5462.4.3
by Barry Warsaw
* Add back Ubuntu distroseries shortcuts. |
126 |
if len(path_parts) == 1: |
127 |
# It's just a project name.
|
|
|
5462.4.1
by Barry Warsaw
Added support for ubuntu: and debianlp: schemes, accessing the relevant |
128 |
lp_url_template = 'lp:%(distro)s/%(project)s' |
129 |
project = path_parts[0] |
|
|
5462.4.3
by Barry Warsaw
* Add back Ubuntu distroseries shortcuts. |
130 |
series = None |
131 |
elif len(path_parts) == 2: |
|
132 |
# It's a series and project.
|
|
|
5462.4.1
by Barry Warsaw
Added support for ubuntu: and debianlp: schemes, accessing the relevant |
133 |
lp_url_template = 'lp:%(distro)s/%(series)s/%(project)s' |
|
5462.4.3
by Barry Warsaw
* Add back Ubuntu distroseries shortcuts. |
134 |
series, project = path_parts |
135 |
else: |
|
136 |
# There are either 0 or > 2 path parts, neither of which is
|
|
137 |
# supported for these schemes.
|
|
|
6729.6.1
by Jelmer Vernooij
Move urlutils errors. |
138 |
raise InvalidURL('Bad path: %s' % url) |
|
5462.4.3
by Barry Warsaw
* Add back Ubuntu distroseries shortcuts. |
139 |
# Expand any series shortcuts, but keep unknown series.
|
140 |
series = distro_series.get(series, series) |
|
|
5462.4.1
by Barry Warsaw
Added support for ubuntu: and debianlp: schemes, accessing the relevant |
141 |
# Hack the url and let the following do the final resolution.
|
142 |
url = lp_url_template % dict( |
|
143 |
distro=distro, |
|
144 |
series=series, |
|
145 |
project=project) |
|
|
5462.4.10
by Vincent Ladeuil
Fix python2.4 compatibility. |
146 |
scheme, netloc, path, query, fragment = urlsplit(url) |
|
5609.24.7
by John Arbash Meinel
Fix bug #397739. Avoid doing an XMLRPC lookup if a user |
147 |
return url, path |
148 |
||
|
5609.24.8
by John Arbash Meinel
Fix the launchpad-login tests. And fix a bad commit typo. |
149 |
def _expand_user(self, path, url, lp_login): |
|
5361.1.1
by John Arbash Meinel
Handle a simple ~ in lp: urls. |
150 |
if path.startswith('~/'): |
|
5609.24.7
by John Arbash Meinel
Fix bug #397739. Avoid doing an XMLRPC lookup if a user |
151 |
if lp_login is None: |
|
6729.6.1
by Jelmer Vernooij
Move urlutils errors. |
152 |
raise InvalidURL(path=url, |
|
5361.1.1
by John Arbash Meinel
Handle a simple ~ in lp: urls. |
153 |
extra='Cannot resolve "~" to your username.' |
154 |
' See "bzr help launchpad-login"') |
|
|
5609.24.7
by John Arbash Meinel
Fix bug #397739. Avoid doing an XMLRPC lookup if a user |
155 |
path = '~' + lp_login + path[1:] |
156 |
return path |
|
157 |
||
158 |
def _resolve(self, url, |
|
159 |
_request_factory=ResolveLaunchpadPathRequest, |
|
160 |
_lp_login=None): |
|
161 |
"""Resolve the base URL for this transport.""" |
|
162 |
url, path = self._update_url_scheme(url) |
|
163 |
if _lp_login is None: |
|
164 |
_lp_login = get_lp_login() |
|
165 |
path = path.strip('/') |
|
|
5609.24.8
by John Arbash Meinel
Fix the launchpad-login tests. And fix a bad commit typo. |
166 |
path = self._expand_user(path, url, _lp_login) |
|
5609.24.7
by John Arbash Meinel
Fix bug #397739. Avoid doing an XMLRPC lookup if a user |
167 |
if _lp_login is not None: |
|
5609.24.9
by John Arbash Meinel
A bunch more tests and bug fixes for the local resolution. |
168 |
result = self._resolve_locally(path, url, _request_factory) |
169 |
if 'launchpad' in debug.debug_flags: |
|
|
5609.24.11
by John Arbash Meinel
If someone uses -Dlaunchpad, use the 'official' URL instead of the local one. |
170 |
local_res = result |
171 |
result = self._resolve_via_xmlrpc(path, url, _request_factory) |
|
|
6150.3.4
by Jonathan Riddell
more launchpad plugin gettext()ing |
172 |
trace.note(gettext( |
173 |
'resolution for {0}\n local: {1}\n remote: {2}').format( |
|
|
6150.3.11
by Jonathan Riddell
syntax fixes |
174 |
url, local_res['urls'], result['urls'])) |
|
5609.24.7
by John Arbash Meinel
Fix bug #397739. Avoid doing an XMLRPC lookup if a user |
175 |
else: |
176 |
result = self._resolve_via_xmlrpc(path, url, _request_factory) |
|
|
2898.4.8
by James Henstridge
Switch lp: over to a pass-through transport, so that the XMLRPC gets |
177 |
|
|
2898.4.14
by James Henstridge
* Use urlsplit() to process URLs. |
178 |
if 'launchpad' in debug.debug_flags: |
|
4505.6.2
by Jonathan Lange
Extract a method that gets a service from a URL. |
179 |
trace.mutter("resolve_lp_path(%r) == %r", url, result) |
|
2898.4.14
by James Henstridge
* Use urlsplit() to process URLs. |
180 |
|
|
3270.4.1
by James Westby
Warn the user when resolving lp: URLs if they haven't set their login. |
181 |
_warned_login = False |
|
2898.4.8
by James Henstridge
Switch lp: over to a pass-through transport, so that the XMLRPC gets |
182 |
for url in result['urls']: |
183 |
scheme, netloc, path, query, fragment = urlsplit(url) |
|
|
3031.2.4
by jml at canonical
Only split the URL once. |
184 |
if self._requires_launchpad_login(scheme, netloc, path, query, |
185 |
fragment): |
|
|
2898.4.8
by James Henstridge
Switch lp: over to a pass-through transport, so that the XMLRPC gets |
186 |
# Only accept launchpad.net bzr+ssh URLs if we know
|
187 |
# the user's Launchpad login:
|
|
|
3777.1.21
by Aaron Bentley
Stop including usernames in resolved lp: urls |
188 |
if _lp_login is not None: |
189 |
break
|
|
|
2898.4.9
by James Henstridge
Add some more tests for the bzr+ssh://bazaar.launchpad.net URL |
190 |
if _lp_login is None: |
|
3270.4.1
by James Westby
Warn the user when resolving lp: URLs if they haven't set their login. |
191 |
if not _warned_login: |
|
3834.1.2
by Martin Pool
Better message when launchpad-login is needed |
192 |
trace.warning( |
|
3834.1.3
by Martin Pool
Shorter message about launchpad-login |
193 |
'You have not informed bzr of your Launchpad ID, and you must do this to\n' |
194 |
'write to Launchpad or access private data. See "bzr help launchpad-login".') |
|
|
3270.4.1
by James Westby
Warn the user when resolving lp: URLs if they haven't set their login. |
195 |
_warned_login = True |
|
2898.4.15
by James Henstridge
Use get_transport() to decide whether Bazaar supports a given URL. |
196 |
else: |
197 |
# Use the URL if we can create a transport for it.
|
|
198 |
try: |
|
|
5609.9.1
by Martin
Blindly change all users of get_transport to address the function via the transport module |
199 |
transport.get_transport(url) |
|
2898.4.15
by James Henstridge
Use get_transport() to decide whether Bazaar supports a given URL. |
200 |
except (errors.PathError, errors.TransportError): |
201 |
pass
|
|
202 |
else: |
|
203 |
break
|
|
|
2898.4.8
by James Henstridge
Switch lp: over to a pass-through transport, so that the XMLRPC gets |
204 |
else: |
|
6729.6.1
by Jelmer Vernooij
Move urlutils errors. |
205 |
raise InvalidURL(path=url, extra='no supported schemes') |
|
2898.4.8
by James Henstridge
Switch lp: over to a pass-through transport, so that the XMLRPC gets |
206 |
return url |
207 |
||
|
2245.8.3
by Martin Pool
Start adding indirection transport |
208 |
|
209 |
def get_test_permutations(): |
|
210 |
# Since this transport doesn't do anything once opened, it's not subjected
|
|
211 |
# to the usual transport tests.
|
|
212 |
return [] |