--- a/mercurial/util.py Thu Dec 23 14:47:33 2021 +0100
+++ b/mercurial/util.py Thu Dec 23 14:47:52 2021 +0100
@@ -57,7 +57,6 @@
hashutil,
procutil,
stringutil,
- urlutil,
)
if pycompat.TYPE_CHECKING:
@@ -2991,54 +2990,6 @@
return r.sub(lambda x: fn(mapping[x.group()[1:]]), s)
-def getport(*args, **kwargs):
- msg = b'getport(...) moved to mercurial.utils.urlutil'
- nouideprecwarn(msg, b'6.0', stacklevel=2)
- return urlutil.getport(*args, **kwargs)
-
-
-def url(*args, **kwargs):
- msg = b'url(...) moved to mercurial.utils.urlutil'
- nouideprecwarn(msg, b'6.0', stacklevel=2)
- return urlutil.url(*args, **kwargs)
-
-
-def hasscheme(*args, **kwargs):
- msg = b'hasscheme(...) moved to mercurial.utils.urlutil'
- nouideprecwarn(msg, b'6.0', stacklevel=2)
- return urlutil.hasscheme(*args, **kwargs)
-
-
-def hasdriveletter(*args, **kwargs):
- msg = b'hasdriveletter(...) moved to mercurial.utils.urlutil'
- nouideprecwarn(msg, b'6.0', stacklevel=2)
- return urlutil.hasdriveletter(*args, **kwargs)
-
-
-def urllocalpath(*args, **kwargs):
- msg = b'urllocalpath(...) moved to mercurial.utils.urlutil'
- nouideprecwarn(msg, b'6.0', stacklevel=2)
- return urlutil.urllocalpath(*args, **kwargs)
-
-
-def checksafessh(*args, **kwargs):
- msg = b'checksafessh(...) moved to mercurial.utils.urlutil'
- nouideprecwarn(msg, b'6.0', stacklevel=2)
- return urlutil.checksafessh(*args, **kwargs)
-
-
-def hidepassword(*args, **kwargs):
- msg = b'hidepassword(...) moved to mercurial.utils.urlutil'
- nouideprecwarn(msg, b'6.0', stacklevel=2)
- return urlutil.hidepassword(*args, **kwargs)
-
-
-def removeauth(*args, **kwargs):
- msg = b'removeauth(...) moved to mercurial.utils.urlutil'
- nouideprecwarn(msg, b'6.0', stacklevel=2)
- return urlutil.removeauth(*args, **kwargs)
-
-
timecount = unitcountfn(
(1, 1e3, _(b'%.0f s')),
(100, 1, _(b'%.1f s')),