Patchwork D7052: phabricator: change conduit data format to match arcanist

login
register
mail settings
Submitter phabricator
Date Oct. 12, 2019, 1:45 p.m.
Message ID <c305bed41f0df215d3ef7ab67ffb264e@localhost.localdomain>
Download mbox | patch
Permalink /patch/42262/
State Not Applicable
Headers show

Comments

phabricator - Oct. 12, 2019, 1:45 p.m.
Kwan added a comment.
Kwan updated this revision to Diff 17102.


  I'd missed out the attrs key conversion needed on py3.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D7052?vs=17082&id=17102

BRANCH
  default

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7052/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7052

AFFECTED FILES
  hgext/phabricator.py

CHANGE DETAILS




To: Kwan, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/hgext/phabricator.py b/hgext/phabricator.py
--- a/hgext/phabricator.py
+++ b/hgext/phabricator.py
@@ -267,8 +267,15 @@ 
     url, authinfo = util.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'api.token'] = token
-    data = urlencodenested(params)
+    params[b'__conduit__'] = {
+        b'token': token,
+    }
+    rawdata = {
+        b'params': templatefilters.json(params),
+        b'output': b'json',
+        b'__conduit__': 1,
+    }
+    data = urlencodenested(rawdata)
     curlcmd = ui.config(b'phabricator', b'curlcmd')
     if curlcmd:
         sin, sout = procutil.popen2(