android/git-repo
1
Fork 0
mirror of https://gerrit.googlesource.com/git-repo synced 2024-12-21 07:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolve fetch urls more efficiently

Browse Source 
Instead of using regex, append the netloc and relative
scheme lists with the custom scheme.
The schemes will only be appended when needed, instead
of passing X amount of regex replaces.

see http://bugs.python.org/issue18828 for more details.

Change-Id: I10d26d5ddc32e7ed04c5a412bdd6e13ec59eb70f
This commit is contained in:
Anthony King 2015-03-28 23:26:04 +00:00 committed by Conley Owens
parent 23ff7df6a7
commit cb07ba7e3d
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
manifest_xml.py
View File

@ -38,8 +38,9 @@ MANIFEST_FILE_NAME = 'manifest.xml'
LOCAL_MANIFEST_NAME = 'local_manifest.xml' LOCAL_MANIFEST_NAME = 'local_manifest.xml'
LOCAL_MANIFESTS_DIR_NAME = 'local_manifests' LOCAL_MANIFESTS_DIR_NAME = 'local_manifests'
urllib.parse.uses_relative.extend(['ssh', 'git']) # urljoin gets confused if the scheme is not known.
urllib.parse.uses_netloc.extend(['ssh', 'git']) urllib.parse.uses_relative.extend(['ssh', 'git', 'persistent-https', 'rpc'])
urllib.parse.uses_netloc.extend(['ssh', 'git', 'persistent-https', 'rpc'])
class _Default(object): class _Default(object):
"""Project defaults within the manifest.""" """Project defaults within the manifest."""
@ -85,21 +86,13 @@ class _XmlRemote(object):
# urljoin will gets confused over quite a few things. The ones we care # urljoin will gets confused over quite a few things. The ones we care
# about here are: # about here are:
# * no scheme in the base url, like <hostname:port> # * no scheme in the base url, like <hostname:port>
# * persistent-https:// # We handle no scheme by replacing it with an obscure protocol, gopher
# * rpc:// # and then replacing it with the original when we are done.
# We handle this by replacing these with obscure protocols
# and then replacing them with the original when we are done.
# gopher -> <none>
# wais -> persistent-https
# nntp -> rpc
if manifestUrl.find(':') != manifestUrl.find('/') - 1: if manifestUrl.find(':') != manifestUrl.find('/') - 1:
manifestUrl = 'gopher://' + manifestUrl url = urllib.parse.urljoin('gopher://' + manifestUrl, url)[9:]
manifestUrl = re.sub(r'^persistent-https://', 'wais://', manifestUrl) else:
manifestUrl = re.sub(r'^rpc://', 'nntp://', manifestUrl) url = urllib.parse.urljoin(manifestUrl, url)
url = urllib.parse.urljoin(manifestUrl, url)
url = re.sub(r'^gopher://', '', url)
url = re.sub(r'^wais://', 'persistent-https://', url)
url = re.sub(r'^nntp://', 'rpc://', url)
return url return url
def ToRemoteSpec(self, projectName): def ToRemoteSpec(self, projectName):