kallithea Changeset - da519b9782e8

Changeset - da519b9782e8

Parent rev.

Child rev.

[Not reviewed]

stable

0 3 0

Mads Kiilerich (mads) - 4 years ago 2022-03-07 17:47:13
mads@kiilerich.com

hg: support Mercurial 6.1 without util.url

3 files changed with 15 insertions and 5 deletions:

kallithea/lib/vcs/backends/git/repository.py

kallithea/lib/vcs/backends/hg/repository.py

kallithea/lib/vcs/utils/helpers.py

0 comments (0 inline, 0 general)

kallithea/lib/vcs/backends/git/repository.py

➞

Show inline comments

@@ @@ -16,13 +16,18 @@ import re @@
 import time
 import urllib.error
 import urllib.parse
 import urllib.request
 from collections import OrderedDict
 import mercurial.util  # import url as hg_url
 try:
     from mercurial.utils.urlutil import url as hg_url
 except ImportError:  # urlutil was introduced in Mercurial 5.8
     from mercurial.util import url as hg_url
 from dulwich.client import SubprocessGitClient
 from dulwich.config import ConfigFile
 from dulwich.objects import Tag
 from dulwich.repo import NotGitRepository, Repo
 from dulwich.server import update_server_info
@@ @@ -223,13 +228,13 @@ class GitRepository(BaseRepository): @@
                     raise urllib.error.URLError("Invalid whitespace character in path: %r" % c)
             return
         if parsed_url.scheme not in ['http', 'https']:
             raise urllib.error.URLError("Unsupported protocol in URL %r" % url)
-        url_obj = mercurial.util.url(safe_bytes(url))
+        url_obj = hg_url(safe_bytes(url))
         test_uri, handlers = get_urllib_request_handlers(url_obj)
         if not test_uri.endswith(b'info/refs'):
             test_uri = test_uri.rstrip(b'/') + b'/info/refs'
         url_obj.passwd = b'*****'
         cleaned_uri = str(url_obj)

kallithea/lib/vcs/backends/hg/repository.py

➞

Show inline comments

@@ @@ -31,13 +31,18 @@ import mercurial.node @@
 import mercurial.patch
 import mercurial.scmutil
 import mercurial.sshpeer
 import mercurial.tags
 import mercurial.ui
 import mercurial.unionrepo
 import mercurial.util
 try:
     from mercurial.utils.urlutil import url as hg_url
 except ImportError:  # urlutil was introduced in Mercurial 5.8
     from mercurial.util import url as hg_url
 from kallithea.lib.vcs.backends.base import BaseRepository, CollectionGenerator
 from kallithea.lib.vcs.exceptions import (BranchDoesNotExistError, ChangesetDoesNotExistError, EmptyRepositoryError, RepositoryError, TagAlreadyExistError,
                                           TagDoesNotExistError, VCSError)
 from kallithea.lib.vcs.utils import ascii_bytes, ascii_str, author_email, author_name, date_fromtimestamp, makedate, safe_bytes, safe_str
 from kallithea.lib.vcs.utils.helpers import get_urllib_request_handlers
@@ @@ -333,13 +338,13 @@ class MercurialRepository(BaseRepository @@
             mercurial.sshpeer.instance(repoui or mercurial.ui.ui(), url, False).lookup(b'tip')
             return
         if '+' in parsed_url.scheme:  # strip 'git+' for hg-git URLs
             url = url.split(b'+', 1)[1]
-        url_obj = mercurial.util.url(url)
+        url_obj = hg_url(url)
         test_uri, handlers = get_urllib_request_handlers(url_obj)
         url_obj.passwd = b'*****'
         cleaned_uri = str(url_obj)
         o = urllib.request.build_opener(*handlers)

kallithea/lib/vcs/utils/helpers.py

➞

Show inline comments

@@ @@ -242,13 +242,13 @@ def get_urllib_request_handlers(url_obj) @@
     handlers = []
     test_uri, authinfo = url_obj.authinfo()
     if authinfo:
         # authinfo is a tuple (realm, uris, user, password) where 'uris' itself
         # is a tuple of URIs.
-        # If url_obj is obtained via mercurial.util.url, the obtained authinfo
+        # If url_obj is obtained via mercurial urlutil, the obtained authinfo
         # values will be bytes, e.g.
         #    (None, (b'http://127.0.0.1/repo', b'127.0.0.1'), b'user', b'pass')
         # However, urllib expects strings, not bytes, so we must convert them.
         # create a password manager
         passmgr = urllib.request.HTTPPasswordMgrWithDefaultRealm()

0 comments (0 inline, 0 general)