Mercurial > hg-git
changeset 445:cf3d83b60b59
Simplified URL handling with a single regular expression. This change enables port declarations with colon-separated urls.
| author | Jason R. Coombs <jaraco@jaraco.com> |
|---|---|
| date | Thu, 26 Jan 2012 22:20:31 -0500 |
| parents | cd5c5a30daec |
| children | 7e6fc0efc500 |
| files | hggit/git_handler.py |
| diffstat | 1 files changed, 11 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- a/hggit/git_handler.py Fri Jan 27 11:52:53 2012 -0600 +++ b/hggit/git_handler.py Thu Jan 26 22:20:31 2012 -0500 @@ -1100,34 +1100,19 @@ ("git@", client.SSHGitClient), ("git+ssh://", client.SSHGitClient)): if uri.startswith(handler): - # We need to split around : or /, whatever comes first hostpath = uri[len(handler):] - if (hostpath.find(':') > 0 and hostpath.find('/') > 0): - # we have both, whatever is first wins. - if hostpath.find(':') < hostpath.find('/'): - hostpath_seper = ':' - else: - hostpath_seper = '/' - elif hostpath.find(':') > 0: - hostpath_seper = ':' - else: - hostpath_seper = '/' + # Support several URL forms, including separating the + # host and path with either a / or : (sepr) + pattern = re.compile( + '^(?P<host>.*?)(:(?P<port>\d+))?(?P<sepr>[:/])(?P<path>.*)$') + res = pattern.match(hostpath).groupdict() + host, port, sepr, path = res['host'], res['port'], res['sepr'], res['path'] + if sepr == '/': + path = '/' + path + if port: + client.port = port - port = None - host, path = hostpath.split(hostpath_seper, 1) - if hostpath_seper == '/': - transportpath = '/' + path - else: - # port number should be recognized - m = re.match('^(?P<port>\d+)?(?P<path>.*)$', path) - if m.group('port'): - client.port = m.group('port') - port = client.port - transportpath = m.group('path') - else: - transportpath = path - - return transport(host, thin_packs=False, port=port), transportpath + return transport(host, thin_packs=False, port=port), path httpclient = getattr(client, 'HttpGitClient', None)