D6497: phabricator: pass ui into readurltoken instead of passing repo
pulkit (Pulkit Goyal)
phabricator at mercurial-scm.org
Sat Jun 8 21:42:00 EDT 2019
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG500b64c5d991: phabricator: pass ui into readurltoken instead of passing repo (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D6497?vs=15385&id=15398
REVISION DETAIL
https://phab.mercurial-scm.org/D6497
AFFECTED FILES
hgext/phabricator.py
CHANGE DETAILS
diff --git a/hgext/phabricator.py b/hgext/phabricator.py
--- a/hgext/phabricator.py
+++ b/hgext/phabricator.py
@@ -183,24 +183,24 @@
process(b'', params)
return util.urlreq.urlencode(flatparams)
-def readurltoken(repo):
+def readurltoken(ui):
"""return conduit url, token and make sure they exist
Currently read from [auth] config section. In the future, it might
make sense to read from .arcconfig and .arcrc as well.
"""
- url = repo.ui.config(b'phabricator', b'url')
+ url = ui.config(b'phabricator', b'url')
if not url:
raise error.Abort(_(b'config %s.%s is required')
% (b'phabricator', b'url'))
- res = httpconnectionmod.readauthforuri(repo.ui, url, util.url(url).user)
+ res = httpconnectionmod.readauthforuri(ui, url, util.url(url).user)
token = None
if res:
group, auth = res
- repo.ui.debug(b"using auth.%s.* for authentication\n" % group)
+ ui.debug(b"using auth.%s.* for authentication\n" % group)
token = auth.get(b'phabtoken')
@@ -212,7 +212,7 @@
def callconduit(repo, name, params):
"""call Conduit API, params is a dict. return json.loads result, or None"""
- host, token = readurltoken(repo)
+ host, token = readurltoken(repo.ui)
url, authinfo = util.url(b'/'.join([host, b'api', name])).authinfo()
repo.ui.debug(b'Conduit Call: %s %s\n' % (url, pycompat.byterepr(params)))
params = params.copy()
@@ -653,7 +653,7 @@
(b'parent', b'Parent ')])
def _confirmbeforesend(repo, revs, oldmap):
- url, token = readurltoken(repo)
+ url, token = readurltoken(repo.ui)
ui = repo.ui
for rev in revs:
ctx = repo[rev]
To: pulkit, #hg-reviewers
Cc: Kwan, mercurial-devel
More information about the Mercurial-devel
mailing list