kallithea Changeset - eb795f7a7a18

Changeset - eb795f7a7a18

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Mads Kiilerich - 6 years ago 2020-03-06 19:20:36
mads@kiilerich.com

utils: let is_valid_repo_uri report URLError from ._check_url as InvalidCloneUriException

Better encapsulation of internals.

1 file changed with 9 insertions and 2 deletions:

kallithea/lib/utils.py

0 comments (0 inline, 0 general)

kallithea/lib/utils.py

➞

Show inline comments

@@ @@ -28,12 +28,13 @@ Original author and date, and relevant c @@
 import datetime
 import logging
 import os
 import re
 import sys
 import traceback
 import urllib.error
 from distutils.version import StrictVersion
 import beaker.cache
 import mercurial.config
 import mercurial.ui
@@ @@ -227,13 +228,16 @@ def is_valid_repo_uri(repo_type, url, ui @@
     """Check if the url seems like a valid remote repo location
     Raise InvalidCloneUriException or other Exception if any problems"""
     if repo_type == 'hg':
         if url.startswith('http') or url.startswith('ssh'):
             # initially check if it's at least the proper URL
             # or does it pass basic auth
             MercurialRepository._check_url(url, ui)
             try:
                 MercurialRepository._check_url(url, ui)
             except urllib.error.URLError as e:
                 raise InvalidCloneUriException('URI %s URLError: %s' % (url, e))
         elif url.startswith('svn+http'):
             try:
                 from hgsubversion.svnrepo import svnremoterepo
             except ImportError:
                 raise InvalidCloneUriException('URI type %s not supported - hgsubversion is not available' % (url,))
             svnremoterepo(ui, url).svn.uuid
@@ @@ -243,13 +247,16 @@ def is_valid_repo_uri(repo_type, url, ui @@
             raise InvalidCloneUriException('URI %s not allowed' % (url,))
     elif repo_type == 'git':
         if url.startswith('http') or url.startswith('git'):
             # initially check if it's at least the proper URL
             # or does it pass basic auth
             GitRepository._check_url(url)
             try:
                 GitRepository._check_url(url)
             except urllib.error.URLError as e:
                 raise InvalidCloneUriException('URI %s URLError: %s' % (url, e))
         elif url.startswith('svn+http'):
             raise InvalidCloneUriException('URI type %s not implemented' % (url,))
         elif url.startswith('hg+http'):
             raise InvalidCloneUriException('URI type %s not implemented' % (url,))
         else:
             raise InvalidCloneUriException('URI %s not allowed' % (url))

0 comments (0 inline, 0 general)