diff hgext/phabricator.py @ 47057:7431f5ab0d2a

branching: merge stable into default

--- a/hgext/phabricator.py	Fri Apr 30 02:11:58 2021 +0200
+++ b/hgext/phabricator.py	Mon May 03 18:55:19 2021 +0200
@@ -403,7 +403,7 @@
 def callconduit(ui, name, params):
     """call Conduit API, params is a dict. return json.loads result, or None"""
     host, token = readurltoken(ui)
-    url, authinfo = util.url(b'/'.join([host, b'api', name])).authinfo()
+    url, authinfo = urlutil.url(b'/'.join([host, b'api', name])).authinfo()
     ui.debug(b'Conduit Call: %s %s\n' % (url, pycompat.byterepr(params)))
     params = params.copy()
     params[b'__conduit__'] = {