( )⚙ D1608 phabricator: switch hgext from conduit to graphql

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1608

phabricator: switch hgext from conduit to graphql
ClosedPublic

Authored by medson on Dec 6 2017, 3:42 PM.
Tags
None
Subscribers
quark

Details

Reviewers
quark
Group Reviewers
Restricted Project
Commits
rFBHGXe898a50bf5cd: phabricator: switch hgext from conduit to graphql
Summary

There are two usages that I found and switched over

  1. hg ssl
  2. hg diff --since-last-arc-diff

The new phabricator_graphql_client.py file came mostly from
fbsource/fbcode/phabricator, but I had to modify it so it could use the lightweight url client instead of the (unavailable) thirdparty "requests" library

This requires the config changes in D6495153, and replaces D5339248

Test Plan

ran "hg ssl" on www and fbsource on my sandbox, and verified that it looked the same before & after my changes.
ran "hg diff --since-last-arc-diff" on a modified workspace, and an unmodified workspace (unmodified results differ, so i'll tidy those up and edit this comment away from the test plan once they match)

I tested both of these steps using an .arcrc containing only username/cert, and one containing username/oauth. I don't think there are any other combinations of .arcrc's around.

To help with review, here's an example. When I do "hg ssl" in a directory with lots of open & closed revisions:

it calls graphql.getrevisioninfo() with

('1608', '1602')

That results in the graphql call like this:

Query:

query RevisionQuery(
  $params:[DifferentialRevisionQueryParams!]!
) {
  differential_revision_query(query_params: $params) {
    results {
      nodes {
        number
        diff_status_name
        latest_active_diff {
        	local_commit_info: diff_properties (
            property_names: ["local:commits"]
          ) {
            nodes {
              property_value
            }
          }
        }
        differential_diffs {
          count
        }
      }
    }
  }
}

Data:

{
  "params": {
    "numbers": [
      "1608",
      "1602"
    ]
  }
}

Response:

{
  "data": {
    "differential_revision_query": [
      {
        "results": {
          "nodes": [
            {
              "number": 1602,
              "diff_status_name": "Closed",
              "latest_active_diff": {
                "local_commit_info": {
                  "nodes": []
                }
              },
              "differential_diffs": {
                "count": 2
              }
            },
            {
              "number": 1608,
              "diff_status_name": "Closed",
              "latest_active_diff": {
                "local_commit_info": {
                  "nodes": []
                }
              },
              "differential_diffs": {
                "count": 1
              }
            }
          ]
        }
      }
    ]
  }
}

which is then post-processed by the getrevisioninfo() function and returned as:

{'1608': {'status': 'Committed', 'count': 1}, '1602': {'status': 'Committed', 'count': 2}}

If you do "hg ssl" in a repo that can respond to the "--since-last-arc-diff" extension, you'll get a graphql response like this:

{
  "data": {
    "differential_revision_query": [
      {
        "results": {
          "nodes": [
            {
              "number": 5197950,
              "diff_status_name": "Needs Revision",
              "latest_active_diff": {
                "local_commit_info": {
                  "nodes": [
                    {
                      "property_value": "{\"baaf3583b9d99b4bafbabc74b629dde07f3130fe\":{\"author\":\"Mark Edson\",\"time\":1496799878,\"branch\":\"default\",\"tag\":\"\",\"commit\":\"baaf3583b9d99b4bafbabc74b629dde07f3130fe\",\"rev\":\"baaf3583b9d99b4bafbabc74b629dde07f3130fe\",\"local\":\"1767197\",\"parents\":[\"2609278551467eda7fa8f9a708606ff66e4bc6de\"],\"summary\":\"Add a script to detect race-condition deletes of accepting reviewers\",\"message\":\"Add a script to detect race-condition deletes of accepting reviewers\\n\\nSummary:\\nWe know this happens, but we don't really know how often it happens, or how\\nmuch time it takes for acceptors to re-accept.  This script will figure out how\\noften it happens, and track time between removal & reaccepting.  It's not 100\\u0025\\naccurate (I found a couple where someone intentionally deleted an accepting\\nreviewer, but almost all of these revisions have some \\\"hey, wtf.  my reviewer\\ngot deleted!\\\" comments in them).\\n\\nTest Plan:\\nTo check all of the created revisions between Jan 1st and today, use this\\ncmdline:\\n\\n.\\/scripts\\/intern\\/phabricator\\/check_racy_badness.php -f 4376105 -t 5196923 -c 50\\n\\nReviewers: #phabricator\\n\\nDifferential Revision: https:\\/\\/phabricator.intern.facebook.com\\/D5197950\",\"authorEmail\":\"medson\\u0040fb.com\"}}"
                    }
                  ]
                }
              },
              "differential_diffs": {
                "count": 1
              }
            }
          ]
        }
      }
    ]
  }
}

And the getrevisioninfo() function will return something like this:

{'5197950': {'status': u'Needs Revision', 'count': 1, 'hash': u'baaf3583b9d99b4bafbabc74b629dde07f3130fe'}}

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

medson created this revision.Dec 6 2017, 3:42 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptDec 6 2017, 3:42 PM
medson edited the test plan for this revision. (Show Details)Dec 6 2017, 3:43 PM
medson planned changes to this revision.Dec 6 2017, 3:48 PM

Bummer. I knew I forgot something.
I need to add the OAuth stuff so the connections will prefer the oauth key if it's in the .arcrc

medson edited the test plan for this revision. (Show Details)Dec 7 2017, 1:51 PM
medson updated this revision to Diff 4167.
medson edited the test plan for this revision. (Show Details)Dec 7 2017, 2:07 PM
medson edited the test plan for this revision. (Show Details)Dec 12 2017, 5:41 PM
quark accepted this revision.Dec 13 2017, 9:39 PM
quark added a subscriber: quark.

Thanks for doing this!

phabricator/graphql.py
91

Maybe use docstring '''?

tests/test-check-py3-compat-hg.t
78–80

These could be solved by adding at the top:

from __future__ import absolute_import
This revision is now accepted and ready to land.Dec 13 2017, 9:39 PM
medson added inline comments.Dec 14 2017, 1:29 PM
tests/test-check-py3-compat-hg.t
78–80

I tried that, but it made a bunch of tests fail with "abort: no module named arcconfig!", so I left it as-is.

quark added inline comments.Dec 14 2017, 1:32 PM
tests/test-check-py3-compat-hg.t
78–80

Ok. I can follow-up cleaning up them.

from phabricator import needs to be changed to relative import. That could be done by moving phabricator directory to hgext3rd and use from .phabricator in files under hgext3rd.

medson edited the test plan for this revision. (Show Details)Dec 14 2017, 1:38 PM
medson updated this revision to Diff 4431.
medson added inline comments.Dec 14 2017, 1:40 PM
tests/test-check-py3-compat-hg.t
78–80

Great, thanks. I've pushed this commit out, but public phabricator hasn't caught it yet, so it doesn't show committed. I'm assuming if I'm just patient, it'll figure it out.
Thanks for the review & suggestions.

medson edited the test plan for this revision. (Show Details)Dec 14 2017, 2:04 PM
medson closed this revision.Dec 15 2017, 10:45 AM

Not sure why this didn't auto-close. It landed as:

changeset: e898a50bf5cd346fbf8aac3efcaa2d2ccf206a6f D1608
user: Mark Edson <medson@fb.com>
date: Thu, 14 Dec 2017 10:28:30 -0800
summary: phabricator: switch hgext from conduit to graphql

Revision Contents
Changeset List

Diff 4167

hgext3rd/arcdiff.py

# arcdiff.py - extension adding an option to the diff command to show changes # arcdiff.py - extension adding an option to the diff command to show changes
# since the last arcanist diff # since the last arcanist diff
# #
# Copyright 2016 Facebook, Inc. # Copyright 2016 Facebook, Inc.
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
import os import os
from mercurial import commands, error, extensions from mercurial import commands, error, extensions
from mercurial.i18n import _ from mercurial.i18n import _
from phabricator import ( from phabricator import (
arcconfig, arcconfig,
conduit, graphql,
diffprops, diffprops,
) )
def extsetup(ui): def extsetup(ui):
entry = extensions.wrapcommand(commands.table, 'diff', _diff) entry = extensions.wrapcommand(commands.table, 'diff', _diff)
options = entry[1] options = entry[1]
options.append(('', 'since-last-arc-diff', None, options.append(('', 'since-last-arc-diff', None,
_('show changes since last `arc diff`'))) _('show changes since last `arc diff`')))
def _differentialhash(ui, repo, phabrev): def _differentialhash(ui, repo, phabrev):
timeout = repo.ui.configint('ssl', 'timeout', 5) timeout = repo.ui.configint('ssl', 'timeout', 5)
ca_certs = repo.ui.configpath('web', 'cacerts') ca_certs = repo.ui.configpath('web', 'cacerts')
client = conduit.Client(ca_certs=ca_certs, timeout=timeout)
try: try:
client.apply_arcconfig(arcconfig.load_for_path(repo.root)) client = graphql.Client(
repodir=repo.root, ca_bundle=ca_certs, repo=repo)
diffid = diffprops.getcurrentdiffidforrev(client, phabrev) info = client.getrevisioninfo(timeout, [phabrev]).get(str(phabrev))
if diffid is None: if not info:
return None return None
return info
localcommits = diffprops.getlocalcommitfordiffid(client, diffid) except graphql.ClientError as e:
return localcommits.get('commit', None) if localcommits else None ui.warn(_('Error calling graphql: %s\n') % str(e))
except conduit.ClientError as e:
ui.warn(_('Error calling conduit: %s\n') % str(e))
return None return None
except arcconfig.ArcConfigError as e: except arcconfig.ArcConfigError as e:
raise error.Abort(str(e)) raise error.Abort(str(e))
def _diff(orig, ui, repo, *pats, **opts): def _diff(orig, ui, repo, *pats, **opts):
if not opts.get('since_last_arc_diff'): if not opts.get('since_last_arc_diff'):
return orig(ui, repo, *pats, **opts) return orig(ui, repo, *pats, **opts)
ctx = repo['.'] ctx = repo['.']
phabrev = diffprops.parserevfromcommitmsg(ctx.description()) phabrev = diffprops.parserevfromcommitmsg(ctx.description())
if phabrev is None: if phabrev is None:
mess = _('local changeset is not associated with a differential ' mess = _('local changeset is not associated with a differential '
'revision') 'revision')
raise error.Abort(mess) raise error.Abort(mess)
rev = _differentialhash(ui, repo, phabrev) rev = _differentialhash(ui, repo, phabrev)
if rev is None:
if rev is None or not isinstance(rev, dict) or "hash" not in rev:
mess = _('unable to determine previous changeset hash') mess = _('unable to determine previous changeset hash')
raise error.Abort(mess) raise error.Abort(mess)
rev = str(rev) rev = str(rev['hash'])
opts['rev'] = [rev] opts['rev'] = [rev]
# if patterns aren't provided, restrict diff to files in both changesets # if patterns aren't provided, restrict diff to files in both changesets
# this prevents performing a diff on rebased changes # this prevents performing a diff on rebased changes
if len(pats) == 0: if len(pats) == 0:
prev = set(repo.unfiltered()[rev].files()) prev = set(repo.unfiltered()[rev].files())
curr = set(repo['.'].files()) curr = set(repo['.'].files())
pats = tuple(os.path.join(repo.root, p) for p in prev | curr) pats = tuple(os.path.join(repo.root, p) for p in prev | curr)
return orig(ui, repo, *pats, **opts) return orig(ui, repo, *pats, **opts)

hgext3rd/phabstatus.py

# phabstatus.py # phabstatus.py
# #
# Copyright 2015 Facebook, Inc. # Copyright 2015 Facebook, Inc.
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from mercurial import cmdutil, extensions, registrar from mercurial import cmdutil, extensions, registrar
from mercurial import util as hgutil from mercurial import util as hgutil
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial import obsutil from mercurial import obsutil
import os
from phabricator import ( from phabricator import (
arcconfig, arcconfig,
conduit,
diffprops, diffprops,
graphql,
) )
def memoize(f): def memoize(f):
""" """
NOTE: This is a hack NOTE: This is a hack
if f args are like (a, b1, b2, b3) and returns [o1, o2, o3] where if f args are like (a, b1, b2, b3) and returns [o1, o2, o3] where
o1, o2, o3 are output of f respectively for (a, b1), (a, b2) and o1, o2, o3 are output of f respectively for (a, b1), (a, b2) and
(a, b3) then we memoize f(a, b1, b2, b3)'s result but also (a, b3) then we memoize f(a, b1, b2, b3)'s result but also
return repo._phabstatuscache[args] return repo._phabstatuscache[args]
return helper return helper
def _fail(repo, diffids, *msgs): def _fail(repo, diffids, *msgs):
for msg in msgs: for msg in msgs:
repo.ui.warn(msg) repo.ui.warn(msg)
return ["Error"] * len(diffids) return ["Error"] * len(diffids)
@memoize @memoize
def getdiffstatus(repo, *diffid): def getdiffstatus(repo, *diffid):
"""Perform a Conduit API call to get the diff status """Perform a Conduit API call to get the diff status
Returns status of the diff""" Returns status of the diff"""
if not diffid: if not diffid:
return [] return []
timeout = repo.ui.configint('ssl', 'timeout', 5) timeout = repo.ui.configint('ssl', 'timeout', 5)
ca_certs = repo.ui.configpath('web', 'cacerts') ca_certs = repo.ui.configpath('web', 'cacerts')
try: try:
resp = conduit.call_conduit('differential.querydiffhashes', client = graphql.Client(
{'revisionIDs': diffid}, repodir=os.getcwd(), ca_bundle=ca_certs, repo=repo)
timeout=timeout, ca_certs=ca_certs) statuses = client.getrevisioninfo(timeout, diffid)
except conduit.ClientError as ex: except graphql.ClientError as ex:
msg = _('Error talking to phabricator. No diff information can be ' msg = _('Error talking to phabricator. No diff information can be '
'provided.\n') 'provided.\n')
hint = _("Error info: %s\n") % str(ex) hint = _("Error info: %s\n") % str(ex)
return _fail(repo, diffid, msg, hint) ret = _fail(repo, diffid, msg, hint)
return ret
except arcconfig.ArcConfigError as ex: except arcconfig.ArcConfigError as ex:
msg = _('arcconfig configuration problem. No diff information can be ' msg = _('arcconfig configuration problem. No diff information can be '
'provided.\n') 'provided.\n')
hint = _("Error info: %s\n") % str(ex) hint = _("Error info: %s\n") % str(ex)
return _fail(repo, diffid, msg, hint) ret = _fail(repo, diffid, msg, hint)
return ret
if not resp:
resp = {}
# This makes the code more robust in case conduit does not return # This makes the code more robust in case we don't learn about any
# what we need # particular revision
result = [] result = []
for diff in diffid: for diff in diffid:
matchingresponse = resp.get(diff) matchingresponse = statuses.get(str(diff))
if not matchingresponse: if not matchingresponse:
result.append("Error") result.append("Error")
else: else:
result.append(matchingresponse) result.append(matchingresponse)
return result return result
def populateresponseforphab(repo, diffnum): def populateresponseforphab(repo, diffnum):
""":populateresponse: Runs the memoization function """:populateresponse: Runs the memoization function
except (IndexError, KeyError, ValueError, TypeError): except (IndexError, KeyError, ValueError, TypeError):
# We got no result back, or it did not contain all required fields # We got no result back, or it did not contain all required fields
return "Error" return "Error"
local = ctx.hex() local = ctx.hex()
if local == remote: if local == remote:
return "sync" return "sync"
elif count == 1: elif count == 1:
precursors = list(obsutil.allpredecessors(repo.obsstore, precursors = list(obsutil.allpredecessors(repo.obsstore, [ctx.node()]))
[ctx.node()]))
hashes = [repo.unfiltered()[h].hex() for h in precursors] hashes = [repo.unfiltered()[h].hex() for h in precursors]
# hashes[0] is the current # hashes[0] is the current
# hashes[1] is the previous # hashes[1] is the previous
if len(hashes) > 1 and hashes[1] == remote: if len(hashes) > 1 and hashes[1] == remote:
return "sync" return "sync"
else: else:
return "unsync" return "unsync"
elif status == "Committed": elif status == "Committed":

phabricator/arcconfig.py

) )
cmdtable = {} cmdtable = {}
command = registrar.command(cmdtable) command = registrar.command(cmdtable)
class ArcConfigError(Exception): class ArcConfigError(Exception):
pass pass
def _load_file(filename): def _loadfile(filename):
try: try:
with open(filename, 'r') as f: with open(filename, 'r') as f:
return json.loads(f.read()) return json.loads(f.read())
except IOError as ex: except IOError as ex:
if ex.errno == errno.ENOENT: if ex.errno == errno.ENOENT:
return None return None
raise raise
def load_for_path(path): def loadforpath(path):
# location where `arc install-certificate` writes .arcrc # location where `arc install-certificate` writes .arcrc
if os.name == 'nt': if os.name == 'nt':
envvar = 'APPDATA' envvar = 'APPDATA'
else: else:
envvar = 'HOME' envvar = 'HOME'
homedir = os.getenv(envvar) homedir = os.getenv(envvar)
if not homedir: if not homedir:
raise ArcConfigError('$%s environment variable not found' % envvar) raise ArcConfigError('$%s environment variable not found' % envvar)
# Use their own file as a basis # Use their own file as a basis
userconfig = _load_file(os.path.join(homedir, '.arcrc')) or {} userconfig = _loadfile(os.path.join(homedir, '.arcrc')) or {}
# Walk up the path and augment with an .arcconfig if we find it, # Walk up the path and augment with an .arcconfig if we find it,
# terminating the search at that point. # terminating the search at that point.
path = os.path.abspath(path) path = os.path.abspath(path)
while len(path) > 1: while len(path) > 1:
config = _load_file(os.path.join(path, '.arcconfig')) config = _loadfile(os.path.join(path, '.arcconfig'))
if config is not None: if config is not None:
userconfig.update(config) userconfig.update(config)
# Return the located path too, as we need this for figuring # Return the located path too, as we need this for figuring
# out where we are relative to the fbsource root. # out where we are relative to the fbsource root.
userconfig['_arcconfig_path'] = path userconfig['_arcconfig_path'] = path
return userconfig return userconfig
path = os.path.dirname(path) path = os.path.dirname(path)
raise ArcConfigError('no .arcconfig found') raise ArcConfigError('no .arcconfig found')
@command('debugarcconfig') @command('debugarcconfig')
def debugarcconfig(ui, repo, *args, **opts): def debugarcconfig(ui, repo, *args, **opts):
""" exists purely for testing and diagnostic purposes """ """ exists purely for testing and diagnostic purposes """
try: try:
config = load_for_path(repo.root) config = loadforpath(repo.root)
ui.write(json.dumps(config, sort_keys=True), '\n') ui.write(json.dumps(config, sort_keys=True), '\n')
except ArcConfigError as ex: except ArcConfigError as ex:
raise error.Abort(str(ex)) raise error.Abort(str(ex))

phabricator/conduit.py

  • This file was deleted.
# conduit.py
#
# A library function to call a phabricator conduit RPC.
# It's different from fbconduit in that this is an authenticated
# conduit client.
from __future__ import absolute_import
import contextlib
import hashlib
import json
import os
import time
import warnings
import urllib3
from mercurial import util
from . import arcconfig
urlreq = util.urlreq
DEFAULT_URL = 'https://phabricator.intern.facebook.com/api/'
DEFAULT_TIMEOUT = 60
mocked_responses = None
class ClientError(Exception):
def __init__(self, code, msg):
Exception.__init__(self, msg)
self.code = code
class Client(object):
def __init__(self, url=None, user=None, cert=None, act_as=None,
ca_certs=None, timeout=None):
self._url = url or DEFAULT_URL
self._user = user
self._cert = cert
self._oauth = None
self._actas = act_as or self._user
self._connection = None
self._ca_certs = ca_certs
self._timeout = timeout
def apply_arcconfig(self, config):
self._url = config.get('conduit_uri', DEFAULT_URL)
if self._url == 'https://phabricator.fb.com/api/':
self._url = 'https://phabricator.intern.facebook.com/api/'
try:
hostconfig = config['hosts'][self._url]
self._user = hostconfig['user']
if 'oauth' in hostconfig:
self._oauth = hostconfig['oauth']
else:
self._cert = hostconfig['cert']
except KeyError:
try:
hostconfig = config['hosts'][config['hosts'].keys()[0]]
self._user = hostconfig['user']
if 'oauth' in hostconfig:
self._oauth = hostconfig['oauth']
else:
self._cert = hostconfig['cert']
except KeyError:
raise arcconfig.ArcConfigError(
'arcrc is missing user '
'credentials for host %s. use '
'"arc install-certificate" to fix.' % self._url)
self._actas = self._user
self._connection = None
def call(self, method, args, timeout=None):
if timeout is None:
if self._timeout is None:
timeout = DEFAULT_TIMEOUT
else:
timeout = self._timeout
args['__conduit__'] = {
'authUser': self._user,
'actAsUser': self._actas,
'caller': 'hg',
}
if self._oauth is not None:
args['__conduit__']['accessToken'] = self._oauth
else:
token = '%d' % time.time()
sig = token + self._cert
args['__conduit__'].update({
'authToken': token,
'authSignature': hashlib.sha1(sig.encode('utf-8')).hexdigest()
})
req_data = {
'params': json.dumps(args),
'output': 'json',
}
headers = (
('Connection', 'Keep-Alive'),
)
url = self._url + method
if self._connection is None:
self._connection = urllib3.PoolManager(ca_certs=self._ca_certs)
try:
with warnings.catch_warnings():
if not self._ca_certs:
# ignore the urllib3 certificate verification warnings
warnings.simplefilter(
'ignore', urllib3.exceptions.InsecureRequestWarning)
response = self._connection.request(
'POST', url, headers=headers, fields=req_data,
timeout=timeout)
except urllib3.exceptions.HTTPError as ex:
errno = -1
if ex.args and util.safehasattr(ex.args[0], 'errno'):
errno = ex.args[0].errno
raise ClientError(errno, str(ex))
try:
response = json.loads(response.data)
except ValueError:
# Can't decode the data, not valid JSON (html error page perhaps?)
raise ClientError(-1, 'did not receive a valid JSON response')
if response['error_code'] is not None:
raise ClientError(response['error_code'], response['error_info'])
return response['result']
class MockClient(object):
def __init__(self, **kwargs):
pass
def apply_arcconfig(self, config):
pass
def call(self, method, args, timeout=DEFAULT_TIMEOUT):
global mocked_responses
cmd = json.dumps([method, args], sort_keys=True)
try:
response = mocked_responses.pop(0)
# Check expectations via a deep compare of the json representation.
# We need this because child objects and values are compared by
# address rather than value.
expect = json.dumps(response.get('cmd', None), sort_keys=True)
if cmd != expect:
raise ClientError(None,
'mock mismatch got %s expected %s' % (
cmd, expect))
if 'error_info' in response:
raise ClientError(response.get('error_code', None),
response['error_info'])
return response['result']
except IndexError:
raise ClientError(None,
'No more mocked responses available for call to %s' % cmd)
if 'HG_ARC_CONDUIT_MOCK' in os.environ:
# To facilitate testing, we replace the client object with this
# fake implementation that returns responses from a file that
# contains a series of json serialized object values.
with open(os.environ['HG_ARC_CONDUIT_MOCK'], 'r') as f:
mocked_responses = json.load(f)
Client = MockClient
class ClientCache(object):
def __init__(self):
self.max_idle_seconds = 10
self.client = {}
self.lastuse = {}
@contextlib.contextmanager
def getclient(self, ca_certs=None):
# Use the existing client if we have one and it hasn't been idle too
# long.
#
# We reconnect if we have been idle for too long just in case the
# server might have closed our connection while we were idle. (We
# could potentially check the socket for readability, but that might
# still race with the server currently closing our socket.)
client = self.client.get(ca_certs),
lastuse = self.lastuse.get(ca_certs, 0)
if client and time.time() <= (lastuse + self.max_idle_seconds):
# Remove self.client for this ca_certs config while we are using
# it. If our caller throws an exception during the yield this
# ensures that we do not continue to use this client later.
del self.client.pop[ca_certs], self.lastuse[ca_certs]
else:
# We have to make a new connection
client = Client(ca_certs=ca_certs)
client.apply_arcconfig(arcconfig.load_for_path(os.getcwd()))
yield client
# Our caller used this client successfully and did not throw an
# exception. Store it to use again next time getclient() is called.
self.lastuse[ca_certs] = time.time()
self.client[ca_certs] = client
_clientcache = ClientCache()
def call_conduit(method, args, ca_certs=None, timeout=DEFAULT_TIMEOUT):
with _clientcache.getclient(ca_certs=ca_certs) as client:
return client.call(method, args, timeout=timeout)

phabricator/diffprops.py

import re import re
from operator import itemgetter
diffrevisionregex = re.compile('^Differential Revision:.*/D(\d+)', re.M) diffrevisionregex = re.compile('^Differential Revision:.*/D(\d+)', re.M)
def parserevfromcommitmsg(description): def parserevfromcommitmsg(description):
"""Parses the D123 revision number from a commit message. """Parses the D123 revision number from a commit message.
Returns just the revision number without the D prefix. Returns just the revision number without the D prefix.
Matches any URL as a candidate, not just our internal phabricator Matches any URL as a candidate, not just our internal phabricator
host, so this can also work with our public phabricator instance, host, so this can also work with our public phabricator instance,
or for others. or for others.
""" """
match = diffrevisionregex.search(description) match = diffrevisionregex.search(description)
return match.group(1) if match else None return match.group(1) if match else None
def getcurrentdiffidforrev(client, phabrev):
"""Given a revision number (the 123 from D123), returns the current
diff id associated with that revision. """
res = client.call('differential.query', {'ids': [phabrev]})
if not res:
return None
info = res[0]
if not info:
return None
diffs = info.get('diffs', [])
if not diffs:
return None
return max(diffs)
def getlocalcommitfordiffid(client, diffid):
"""Returns the most recent local:commits entry for a phabricator diff_id"""
res = client.call('differential.getdiffproperties', {
'diff_id': diffid,
'names': ['local:commits']})
if not res:
return None
localcommits = res.get('local:commits', {})
if not localcommits:
return None
# Order with most recent commit time first. A more completely correct
# implementation would toposort based on the parents properties, however,
# wez thinks that we should only contain a single entry most of the time,
# and our best prior art used to just take the first item that showed up
# in the dictionary. Sorting gives us some determinism, so we will at
# least be consistently wrong if we're wrong.
localcommits = sorted(localcommits.values(),
key=itemgetter('time'), reverse=True)
return localcommits[0]

phabricator/graphql.py

  • This file was added.
# graphql.py
#
# A library function to call a phabricator graphql RPC.
# This replaces the Conduit methods
import json
import os
from mercurial import util
import arcconfig
from operator import itemgetter
import phabricator_graphql_client
import phabricator_graphql_client_urllib
urlreq = util.urlreq
class ClientError(Exception):
def __init__(self, code, msg):
Exception.__init__(self, msg)
self.code = code
class Client(object):
def __init__(self, repodir=os.getcwd(), ca_bundle=None, repo=None):
self._mock = 'HG_ARC_CONDUIT_MOCK' in os.environ
if self._mock:
with open(os.environ['HG_ARC_CONDUIT_MOCK'], 'r') as f:
self._mocked_responses = json.load(f)
self._host = None
self._user = None
self._cert = None
self._oauth = None
self.ca_bundle = ca_bundle or True
self._applyarcconfig(arcconfig.loadforpath(repodir))
if not self._mock:
app_id = repo.ui.config('phabricator', 'graphql_app_id')
app_token = repo.ui.config('phabricator', 'graphql_app_token')
self._host = repo.ui.config('phabricator', 'graphql_host')
self._client = phabricator_graphql_client.PhabricatorGraphQLClient(
phabricator_graphql_client_urllib.
PhabricatorGraphQLClientRequests(), self._cert, self._oauth,
self._user, 'phabricator', self._host, app_id, app_token)
def _applyarcconfig(self, config):
self._host = config.get('graphql_uri', self._host)
if 'OVERRIDE_GRAPHQL_URI' in os.environ:
self._host = os.environ['OVERRIDE_GRAPHQL_URI']
try:
hostconfig = config['hosts'][self._host]
self._user = hostconfig['user']
self._cert = hostconfig.get('cert', None)
self._oauth = hostconfig.get('oauth', None)
except KeyError:
try:
hostconfig = config['hosts'][config['hosts'].keys()[0]]
self._user = hostconfig['user']
self._cert = hostconfig.get('cert', None)
self._oauth = hostconfig.get('oauth', None)
except KeyError:
pass
if self._cert is None and self._oauth is None:
raise arcconfig.ArcConfigError(
'arcrc is missing user '
'credentials for host %s. use '
'"arc install-certificate" to fix.' % self._host)
def _normalizerevisionnumbers(self, *revision_numbers):
rev_numbers = []
if isinstance(revision_numbers, str):
return [int(revision_numbers)]
for r in revision_numbers:
if isinstance(r, list) or isinstance(r, tuple):
for rr in r:
rev_numbers.extend(rr)
else:
rev_numbers.append(int(r))
return [int(x) for x in rev_numbers]
def getrevisioninfo(self, timeout, *revision_numbers):
if self._mock:
response = self._mocked_responses.pop(0)
if 'error_info' in response:
raise ClientError(response.get('error_code', None),
response['error_info'])
return response['result']
rev_numbers = self._normalizerevisionnumbers(revision_numbers)
ret = self._client.query(
timeout,
' \
quarkUnsubmitted
Not Done

Maybe use docstring '''?

quark: Maybe use docstring `'''`?
query RevisionQuery( \
$params: [DifferentialRevisionQueryParams!]! \
) { \
differential_revision_query(query_params: $params) { \
results { \
nodes { \
number \
diff_status_name \
latest_active_diff { \
local_commit_info: diff_properties ( \
property_names: ["local:commits"] \
) { \
nodes { \
property_value \
} \
} \
} \
differential_diffs { \
count \
} \
} \
} \
} \
} \
'
,
{'params': {
'numbers': rev_numbers,
}},
)
revisions = ret['differential_revision_query'][0]['results'][
'nodes']
if revisions is None:
return None
infos = {}
for revision in rev_numbers:
info = {}
for node in ret['differential_revision_query'][0][
'results']['nodes']:
if node['number'] != revision:
continue
status = node['diff_status_name']
# GraphQL uses "Closed" but Conduit used "Committed" so let's
# not change the naming
if status == 'Closed':
status = 'Committed'
info['status'] = status
active_diff = node['latest_active_diff']
if active_diff is None:
continue
info['count'] = node['differential_diffs']['count']
localcommitnode = active_diff['local_commit_info']['nodes']
if localcommitnode is not None and len(localcommitnode) == 1:
localcommits = json.loads(localcommitnode[0][
'property_value'])
localcommits = sorted(localcommits.values(),
key=itemgetter('time'), reverse=True)
info['hash'] = localcommits[0].get('commit', None)
infos[str(revision)] = info
return infos

phabricator/phabricator_graphql_client.py

  • This file was added.
from __future__ import absolute_import
from __future__ import division
from __future__ import unicode_literals
import time
class PhabricatorGraphQLClient(object):
def __init__(self,
urllib,
ph_cert,
ph_oauth,
ph_user_name,
source,
host,
app_id,
app_token,
ca_bundle=None):
self.urllib = urllib
self.phabricator_certificate = ph_cert
self.phabricator_oauth = ph_oauth
self.user = ph_user_name
self.__cert_time = 0
self.graphql_url = host + '/graphql'
self.token_url = host + '/phabricator/get_token'
self.source = source
self.app_id = app_id
self.app_token = app_token
self.ca_bundle = ca_bundle
def query(self, timeout, request, params=None):
"""
Make a graphql2 (OSS) request to phabricator data
"""
self._checkconnection(timeout)
if self.phabricator_oauth is None:
data = {'phabricator_token': self.__cert, 'doc': request,
'variables': params}
else:
data = {'access_token': self.phabricator_oauth, 'doc': request,
'variables': params}
return self.urllib.sendpost(
self.graphql_url,
data=data,
timeout=timeout,
ca_bundle=self.ca_bundle).get('data')
def _checkconnection(self, timeout):
"""
We only care about the expiring Phabricator token if we don't have
an OAuth token
"""
if self.phabricator_oauth is None:
if time.time() - self.__cert_time > 600:
self._connect(timeout)
data = {'phabricator_token': self.__cert, 'source': self.source}
self.urllib.sendpost(
self.graphql_url,
data=data,
timeout=timeout,
ca_bundle=self.ca_bundle)
def _connect(self, timeout):
"""
Private method to get token to make calls, unless we're using the
OAuth token, then we just do nothing here
"""
if self.phabricator_oauth is None:
data = {
'ph_certificate': self.phabricator_certificate,
'ph_user_name': self.user,
'app': self.app_id,
'token': self.app_token
}
res = self.urllib.sendpost(
self.token_url,
data=data,
timeout=timeout,
ca_bundle=self.ca_bundle)
self.__cert = res.get('token')
self.__cert_time = time.time()

phabricator/phabricator_graphql_client_requests.py

  • This file was added.
import requests
import json
# helper class so phabricator_graphql_client can talk using the requests
# third-party library
class PhabricatorClientError(Exception):
def __init__(self, reason, error):
Exception.__init__(self, reason, error)
class PhabricatorGraphQLClientRequests(object):
def sendpost(self, request_url, data, timeout, ca_bundle):
res = requests.post(request_url, data, verify=ca_bundle or True)
data = json.loads(res.content.decode('utf8'))
if res.status_code != 200:
raise PhabricatorClientError(
'Phabricator not available ' + 'returned ' + str(res.status),
res)
# Apparently both singular and plural are used.
if 'error' in data:
raise PhabricatorClientError("Error in query", data['error'])
if 'errors' in data:
raise PhabricatorClientError("Error in query", data['errors'])
return data

phabricator/phabricator_graphql_client_urllib.py

  • This file was added.
from mercurial.util import httplib
from mercurial import util
import json
urlreq = util.urlreq
# helper class so phabricator_graphql_client can talk using the requests
# third-party library
class PhabricatorClientError(Exception):
def __init__(self, reason, error):
Exception.__init__(self, reason, error)
class PhabricatorGraphQLClientRequests(object):
def __init__(self):
self._connection = None
def __verify_connection(self, request_url, timeout, ca_bundle):
urlparts = urlreq.urlparse(request_url)
if self._connection is None:
if urlparts.scheme == 'http':
self._connection = httplib.HTTPConnection(
urlparts.netloc, timeout=timeout)
elif urlparts.scheme == 'https':
self._connection = httplib.HTTPSConnection(
urlparts.netloc, timeout=timeout, cert_file=ca_bundle)
else:
raise PhabricatorClientError('Unknown host scheme: %s',
urlparts.scheme)
return urlparts
def sendpost(self, request_url, data, timeout, ca_bundle):
urlparts = self.__verify_connection(request_url, timeout, ca_bundle)
query = util.urlreq.urlencode(data)
headers = {
'Connection': 'Keep-Alive',
'Content-Type': 'application/x-www-form-urlencoded',
}
self._connection.request('POST', (urlparts.path), query, headers)
response = json.load(self._connection.getresponse())
return response

tests/test-check-code-hg.t

Skipping ctreemanifest/manifest_entry.cpp it has no-che?k-code (glob) Skipping ctreemanifest/manifest_entry.cpp it has no-che?k-code (glob)
Skipping ctreemanifest/manifest_entry.h it has no-che?k-code (glob) Skipping ctreemanifest/manifest_entry.h it has no-che?k-code (glob)
Skipping ctreemanifest/manifest_fetcher.cpp it has no-che?k-code (glob) Skipping ctreemanifest/manifest_fetcher.cpp it has no-che?k-code (glob)
Skipping ctreemanifest/manifest_fetcher.h it has no-che?k-code (glob) Skipping ctreemanifest/manifest_fetcher.h it has no-che?k-code (glob)
Skipping ctreemanifest/manifest_ptr.cpp it has no-che?k-code (glob) Skipping ctreemanifest/manifest_ptr.cpp it has no-che?k-code (glob)
Skipping ctreemanifest/manifest_ptr.h it has no-che?k-code (glob) Skipping ctreemanifest/manifest_ptr.h it has no-che?k-code (glob)
Skipping ctreemanifest/treemanifest.cpp it has no-che?k-code (glob) Skipping ctreemanifest/treemanifest.cpp it has no-che?k-code (glob)
Skipping ctreemanifest/treemanifest.h it has no-che?k-code (glob) Skipping ctreemanifest/treemanifest.h it has no-che?k-code (glob)
phabricator/conduit.py:16:
> import urllib3
don't use urllib, use util.urlreq/util.urlerr
Skipping tests/conduithttp.py it has no-che?k-code (glob) Skipping tests/conduithttp.py it has no-che?k-code (glob)
tests/test-myparent.t:56: tests/test-myparent.t:56:
> $ hg help templates | grep -A2 myparent > $ hg help templates | grep -A2 myparent
don't use grep's context flags don't use grep's context flags
tests/test-rage.t:10: tests/test-rage.t:10:
> $ echo "rpmbin = /bin/rpm" >> .hg/hgrc > $ echo "rpmbin = /bin/rpm" >> .hg/hgrc
don't use explicit paths for tools don't use explicit paths for tools
Skipping tests/test-remotefilelog-bad-configs.t it has no-che?k-code (glob) Skipping tests/test-remotefilelog-bad-configs.t it has no-che?k-code (glob)

tests/test-check-config-hg.t

undocumented: infinitepush.bundle-stream (bool) undocumented: infinitepush.bundle-stream (bool)
undocumented: morestatus.show (bool) undocumented: morestatus.show (bool)
undocumented: nointerrupt.interactiveonly (bool) [True] undocumented: nointerrupt.interactiveonly (bool) [True]
undocumented: perftweaks.cachenoderevs (bool) [True] undocumented: perftweaks.cachenoderevs (bool) [True]
undocumented: perftweaks.disablebranchcache (bool) undocumented: perftweaks.disablebranchcache (bool)
undocumented: perftweaks.disablecasecheck (bool) undocumented: perftweaks.disablecasecheck (bool)
undocumented: perftweaks.disabletags (bool) undocumented: perftweaks.disabletags (bool)
undocumented: perftweaks.preferdeltas (bool) undocumented: perftweaks.preferdeltas (bool)
undocumented: phabricator.graphql_app_id (str)
undocumented: phabricator.graphql_app_token (str)
undocumented: phabricator.graphql_host (str)
undocumented: phabstatus.logpeekahead (int) [30] undocumented: phabstatus.logpeekahead (int) [30]
undocumented: phrevset.callsign (str) undocumented: phrevset.callsign (str)
undocumented: pushrebase.blocknonpushrebase (bool) undocumented: pushrebase.blocknonpushrebase (bool)
undocumented: pushrebase.rewritedates (bool) undocumented: pushrebase.rewritedates (bool)
undocumented: rage.fastmanifestcached (bool) undocumented: rage.fastmanifestcached (bool)
undocumented: remotefilelog.backgroundrepack (bool) undocumented: remotefilelog.backgroundrepack (bool)
undocumented: remotefilelog.cachegroup (str) undocumented: remotefilelog.cachegroup (str)
undocumented: remotefilelog.debug (bool) undocumented: remotefilelog.debug (bool)

tests/test-check-py3-compat-hg.t

infinitepush/common.py not using absolute_import infinitepush/common.py not using absolute_import
infinitepush/fileindexapi.py not using absolute_import infinitepush/fileindexapi.py not using absolute_import
infinitepush/indexapi.py not using absolute_import infinitepush/indexapi.py not using absolute_import
infinitepush/sqlindexapi.py not using absolute_import infinitepush/sqlindexapi.py not using absolute_import
infinitepush/store.py not using absolute_import infinitepush/store.py not using absolute_import
linelog/pyext/test-random-edits.py not using absolute_import linelog/pyext/test-random-edits.py not using absolute_import
phabricator/arcconfig.py not using absolute_import phabricator/arcconfig.py not using absolute_import
phabricator/diffprops.py not using absolute_import phabricator/diffprops.py not using absolute_import
phabricator/graphql.py not using absolute_import
phabricator/phabricator_graphql_client_requests.py not using absolute_import
phabricator/phabricator_graphql_client_urllib.py not using absolute_import
quarkUnsubmitted
Not Done

These could be solved by adding at the top:

from __future__ import absolute_import
quark: These could be solved by adding at the top: from __future__ import absolute_import
medsonAuthorUnsubmitted
Not Done

I tried that, but it made a bunch of tests fail with "abort: no module named arcconfig!", so I left it as-is.

medson: I tried that, but it made a bunch of tests fail with "abort: no module named arcconfig!", so I…
quarkUnsubmitted
Not Done

Ok. I can follow-up cleaning up them.

from phabricator import needs to be changed to relative import. That could be done by moving phabricator directory to hgext3rd and use from .phabricator in files under hgext3rd.

quark: Ok. I can follow-up cleaning up them. `from phabricator import` needs to be changed to…
medsonAuthorUnsubmitted
Not Done

Great, thanks. I've pushed this commit out, but public phabricator hasn't caught it yet, so it doesn't show committed. I'm assuming if I'm just patient, it'll figure it out.
Thanks for the review & suggestions.

medson: Great, thanks. I've pushed this commit out, but public phabricator hasn't caught it yet, so it…
remotefilelog/__init__.py not using absolute_import remotefilelog/__init__.py not using absolute_import
remotefilelog/cacheclient.py not using absolute_import remotefilelog/cacheclient.py not using absolute_import
remotefilelog/constants.py not using absolute_import remotefilelog/constants.py not using absolute_import
remotefilelog/historypack.py not using absolute_import remotefilelog/historypack.py not using absolute_import
remotefilelog/lz4wrapper.py not using absolute_import remotefilelog/lz4wrapper.py not using absolute_import
remotefilelog/metadatastore.py not using absolute_import remotefilelog/metadatastore.py not using absolute_import
remotefilelog/remotefilectx.py not using absolute_import remotefilelog/remotefilectx.py not using absolute_import
remotefilelog/shallowbundle.py not using absolute_import remotefilelog/shallowbundle.py not using absolute_import

tests/test-diff-since-last-arc-diff.t

$ echo bleet > foo $ echo bleet > foo
$ hg ci -qm 'Differential Revision: https://phabricator.fb.com/D1' $ hg ci -qm 'Differential Revision: https://phabricator.fb.com/D1'
$ hg diff --since-last-arc-diff $ hg diff --since-last-arc-diff
abort: no .arcconfig found abort: no .arcconfig found
[255] [255]
Prep configuration Prep configuration
$ echo '{}' > .arcconfig
$ echo '{}' > .arcrc $ echo '{}' > .arcrc
$ echo '{"config" : {"default" : "https://a.com/api"}, "hosts" : {"https://a.com/api/" : { "user" : "testuser", "cert" : "garbage_cert"}}}' > .arcconfig
Now progressively test the response handling for variations of missing data Now progressively test the response handling for variations of missing data
$ cat > $TESTTMP/mockduit << EOF $ cat > $TESTTMP/mockduit << EOF
> [{"cmd": ["differential.query", {"ids": ["1"]}], "result": null}] > [{"result": {}}]
> EOF > EOF
$ HG_ARC_CONDUIT_MOCK=$TESTTMP/mockduit hg diff --since-last-arc-diff $ HG_ARC_CONDUIT_MOCK=$TESTTMP/mockduit hg diff --since-last-arc-diff
abort: unable to determine previous changeset hash abort: unable to determine previous changeset hash
[255] [255]
$ cat > $TESTTMP/mockduit << EOF $ cat > $TESTTMP/mockduit << EOF
> [{"cmd": ["differential.query", {"ids": ["1"]}], "result": [{"diffs": []}]}] > [{"result": {"2" : {}}}]
> EOF > EOF
$ HG_ARC_CONDUIT_MOCK=$TESTTMP/mockduit hg diff --since-last-arc-diff $ HG_ARC_CONDUIT_MOCK=$TESTTMP/mockduit hg diff --since-last-arc-diff
abort: unable to determine previous changeset hash abort: unable to determine previous changeset hash
[255] [255]
$ cat > $TESTTMP/mockduit << EOF $ cat > $TESTTMP/mockduit << EOF
> [{"cmd": ["differential.query", {"ids": ["1"]}], "result": [{"diffs": [1]}]}, > [{"result": {"1" : {"count": 3, "status": "Needs Review"}}}]
> {"cmd": ["differential.getdiffproperties", {
> "diff_id": 1,
> "names": ["local:commits"]}],
> "result": []
> }]
> EOF > EOF
$ HG_ARC_CONDUIT_MOCK=$TESTTMP/mockduit hg diff --since-last-arc-diff $ HG_ARC_CONDUIT_MOCK=$TESTTMP/mockduit hg diff --since-last-arc-diff
abort: unable to determine previous changeset hash abort: unable to determine previous changeset hash
[255] [255]
$ cat > $TESTTMP/mockduit << EOF $ cat > $TESTTMP/mockduit << EOF
> [{"cmd": ["differential.query", {"ids": ["1"]}], "result": [{"diffs": [1]}]}, > [{"result": {"1" : {"status": "Needs Review"}}}]
> {"cmd": ["differential.getdiffproperties", {
> "diff_id": 1,
> "names": ["local:commits"]}],
> "result": {"local:commits": []}
> }]
> EOF > EOF
$ HG_ARC_CONDUIT_MOCK=$TESTTMP/mockduit hg diff --since-last-arc-diff $ HG_ARC_CONDUIT_MOCK=$TESTTMP/mockduit hg diff --since-last-arc-diff
abort: unable to determine previous changeset hash abort: unable to determine previous changeset hash
[255] [255]
This is the case when the diff is up to date with the current commit; This is the case when the diff is up to date with the current commit;
there is no diff since what was landed. there is no diff since what was landed.
$ cat > $TESTTMP/mockduit << EOF $ cat > $TESTTMP/mockduit << EOF
> [{"cmd": ["differential.query", {"ids": ["1"]}], "result": [{"diffs": [1]}]}, > [{"result": {"1" : {"hash": "2e6531b7dada2a3e5638e136de05f51e94a427f4", "count": 1, "status": "Needs Review"}}}]
> {"cmd": ["differential.getdiffproperties", {
> "diff_id": 1,
> "names": ["local:commits"]}],
> "result": {"local:commits": {
> "2e6531b7dada2a3e5638e136de05f51e94a427f4": {
> "commit": "2e6531b7dada2a3e5638e136de05f51e94a427f4",
> "time": 0}}}
> }]
> EOF > EOF
$ HG_ARC_CONDUIT_MOCK=$TESTTMP/mockduit hg diff --since-last-arc-diff $ HG_ARC_CONDUIT_MOCK=$TESTTMP/mockduit hg diff --since-last-arc-diff
This is the case when the diff points at our parent commit, we expect to This is the case when the diff points at our parent commit, we expect to
see the bleet text show up. There's a fake hash that I've injected into see the bleet text show up. There's a fake hash that I've injected into
the commit list returned from our mocked phabricator; it is present to the commit list returned from our mocked phabricator; it is present to
assert that we order the commits consistently based on the time field. assert that we order the commits consistently based on the time field.
$ cat > $TESTTMP/mockduit << EOF $ cat > $TESTTMP/mockduit << EOF
> [{"cmd": ["differential.query", {"ids": ["1"]}], "result": [{"diffs": [1]}]}, > [{"result": {"1" : {"hash": "88dd5a13bf28b99853a24bddfc93d4c44e07c6bd", "count": 1, "status": "Needs Review"}}}]
> {"cmd": ["differential.getdiffproperties", {
> "diff_id": 1,
> "names": ["local:commits"]}],
> "result": {"local:commits": {
> "88dd5a13bf28b99853a24bddfc93d4c44e07c6bd": {
> "commit": "88dd5a13bf28b99853a24bddfc93d4c44e07c6bd",
> "time": 10},
> "fakehashtotestsorting": {
> "commit": "fakehashtotestsorting",
> "time": 5}}}
> }]
> EOF > EOF
$ HG_ARC_CONDUIT_MOCK=$TESTTMP/mockduit hg diff --since-last-arc-diff --nodates $ HG_ARC_CONDUIT_MOCK=$TESTTMP/mockduit hg diff --since-last-arc-diff --nodates
diff -r 88dd5a13bf28 foo diff -r 88dd5a13bf28 foo
--- a/foo --- a/foo
+++ b/foo +++ b/foo
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+bleet +bleet

tests/test-fastlog.t

$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [extensions] > [extensions]
> tweakdefaults=$TESTDIR/../hgext3rd/tweakdefaults.py > tweakdefaults=$TESTDIR/../hgext3rd/tweakdefaults.py
> fastlog=$TESTDIR/../hgext3rd/fastlog.py > fastlog=$TESTDIR/../hgext3rd/fastlog.py
> fbconduit=$TESTDIR/../hgext3rd/fbconduit.py
> [fbconduit] > [fbconduit]
> host=our.intern.facebook.com > host=our.intern.facebook.com
> protocol=http > protocol=http
> reponame=fbsource > reponame=fbsource
> path=/intern/conduit/ > path=/intern/conduit/
> [fastlog] > [fastlog]
> enabled=True > enabled=True
> EOF > EOF
$ hg log dir -G -T '{rev} {desc}\n' --all $ hg log dir -G -T '{rev} {desc}\n' --all
@ 2 b @ 2 b
| |
| o 1 a2 | o 1 a2
|/ |/
o 0 a o 0 a
Create a merge Create a merge
$ hg merge --config tweakdefaults.allowmerge=True $ hg merge --config tweakdefaults.allowmerge=True
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ hg log -T '{rev} {desc}\n' $ hg log -T '{rev} {desc}\n'
2 b 2 b
0 a 0 a
6 major repo reorg 6 major repo reorg
Multi-path queries Multi-path queries
$ hg log parent/dir parent/dir2 -T '{node}\n' $ hg log parent/dir parent/dir2 -T '{node}\n'
11c9870ffc4024fab11bf166a00b2852ea36bcf6 11c9870ffc4024fab11bf166a00b2852ea36bcf6
5946a2427fdfcb068a8aec1a59227d0d76062b43 5946a2427fdfcb068a8aec1a59227d0d76062b43
728676e01661ccc3d7e39de054ca3a7288d7e7b6 728676e01661ccc3d7e39de054ca3a7288d7e7b6
Test with failed network call
$ cat > $TESTTMP/bad_conduit.py <<'EOF'
> def call_conduit(*args, **kwargs):
> raise Exception('failed')
> def conduit_config(*args, **kwargs):
> return True
> EOF
$ cat >> $HGRCPATH << EOF
> [extensions]
> fbconduit=$TESTTMP/bad_conduit.py
> EOF
$ hg log parent -T '{rev} {desc}\n' 2>&1 | grep --invert-match 'failed'
9 toys
8 treats
7 cookies
6 major repo reorg

tests/test-phabstatus.t

$ hg log -T '{phabstatus}\n' -r . $ hg log -T '{phabstatus}\n' -r .
arcconfig configuration problem. No diff information can be provided. arcconfig configuration problem. No diff information can be provided.
Error info: no .arcconfig found Error info: no .arcconfig found
Error Error
Configure arc... Configure arc...
$ echo '{}' > .arcconfig
$ echo '{}' > .arcrc $ echo '{}' > .arcrc
$ echo '{"config" : {"default" : "https://a.com/api"}, "hosts" : {"https://a.com/api/" : { "user" : "testuser", "cert" : "garbage_cert"}}}' > .arcconfig
And now with bad responses: And now with bad responses:
$ cat > $TESTTMP/mockduit << EOF $ cat > $TESTTMP/mockduit << EOF
> [{"cmd": ["differential.querydiffhashes", {"revisionIDs": ["1"]}], "result": {}}] > [{"cmd": ["differential.querydiffhashes", {"revisionIDs": ["1"]}], "result": {}}]
> EOF > EOF
$ HG_ARC_CONDUIT_MOCK=$TESTTMP/mockduit hg log -T '{phabstatus}\n' -r . $ HG_ARC_CONDUIT_MOCK=$TESTTMP/mockduit hg log -T '{phabstatus}\n' -r .
Error Error
$ hg help templates | egrep 'phabstatus|syncstatus' $ hg help templates | egrep 'phabstatus|syncstatus'
phabstatus String. Return the diff approval status for a given hg rev phabstatus String. Return the diff approval status for a given hg rev
syncstatus String. Return whether the local revision is in sync with syncstatus String. Return whether the local revision is in sync with
Make sure we get decent error messages when .arcrc is missing credential Make sure we get decent error messages when .arcrc is missing credential
information. We intentionally do not use HG_ARC_CONDUIT_MOCK for this test, information. We intentionally do not use HG_ARC_CONDUIT_MOCK for this test,
so it tries to parse the (empty) arc config files. so it tries to parse the (empty) arc config files.
$ echo '{}' > .arcrc
$ echo '{}' > .arcconfig
$ hg log -T '{phabstatus}\n' -r . $ hg log -T '{phabstatus}\n' -r .
arcconfig configuration problem. No diff information can be provided. arcconfig configuration problem. No diff information can be provided.
Error info: arcrc is missing user credentials for host https://phabricator.intern.facebook.com/api/. use "arc install-certificate" to fix. Error info: arcrc is missing user credentials for host None. use "arc install-certificate" to fix.
Error Error

tests/test-syncstatus.t

$ hg log -T '{syncstatus}\n' -r . $ hg log -T '{syncstatus}\n' -r .
arcconfig configuration problem. No diff information can be provided. arcconfig configuration problem. No diff information can be provided.
Error info: no .arcconfig found Error info: no .arcconfig found
Error Error
Configure arc... Configure arc...
$ echo '{}' > .arcconfig
$ echo '{}' > .arcrc $ echo '{}' > .arcrc
$ echo '{"config" : {"default" : "https://a.com/api"}, "hosts" : {"https://a.com/api/" : { "user" : "testuser", "cert" : "garbage_cert"}}}' > .arcconfig
And now with bad responses: And now with bad responses:
$ cat > $TESTTMP/mockduit << EOF $ cat > $TESTTMP/mockduit << EOF
> [{"cmd": ["differential.querydiffhashes", {"revisionIDs": ["1"]}], "result": {}}] > [{"cmd": ["differential.querydiffhashes", {"revisionIDs": ["1"]}], "result": {}}]
> EOF > EOF
$ HG_ARC_CONDUIT_MOCK=$TESTTMP/mockduit hg log -T '{syncstatus}\n' -r . $ OVERRIDE_GRAPHQL_URI=https://a.com HG_ARC_CONDUIT_MOCK=$TESTTMP/mockduit hg log -T '{syncstatus}\n' -r .
Error Error
$ cat > $TESTTMP/mockduit << EOF $ cat > $TESTTMP/mockduit << EOF
> [{"cmd": ["differential.querydiffhashes", {"revisionIDs": ["1"]}], "error_info": "failed, yo"}] > [{"cmd": ["differential.querydiffhashes", {"revisionIDs": ["1"]}], "error_info": "failed, yo"}]
> EOF > EOF
$ HG_ARC_CONDUIT_MOCK=$TESTTMP/mockduit hg log -T '{syncstatus}\n' -r . $ HG_ARC_CONDUIT_MOCK=$TESTTMP/mockduit hg log -T '{syncstatus}\n' -r .
Error talking to phabricator. No diff information can be provided. Error talking to phabricator. No diff information can be provided.
Error info: failed, yo Error info: failed, yo
And finally, the success case And finally, the success case
$ cat > $TESTTMP/mockduit << EOF $ cat > $TESTTMP/mockduit << EOF
> [{"cmd": ["differential.querydiffhashes", {"revisionIDs": ["1"]}], > [{"cmd": ["differential.querydiffhashes", {"revisionIDs": ["1"]}],
> "result": {"1" : {"count": 3, "status": "Committed", "hash": "lolwut"}}}] > "result": {"1" : {"count": 3, "status": "Committed", "hash": "lolwut"}}}]
> EOF > EOF
$ HG_ARC_CONDUIT_MOCK=$TESTTMP/mockduit hg log -T '{syncstatus}\n' -r . $ HG_ARC_CONDUIT_MOCK=$TESTTMP/mockduit hg log -T '{syncstatus}\n' -r .
committed committed
phabricator/arcconfig.py