mirror of
https://github.com/facebook/sapling.git
synced 2024-10-12 01:39:21 +03:00
584656dff3
Summary: Turned on the auto formatter. Ran `arc lint --apply-patches --take BLACK **/*.py`. Then run `arc lint` again so some other autofixers like spellchecker etc. looked at the code base. Manually accept the changes whenever they make sense, or use a workaround (ex. changing "dict()" to "dict constructor") where autofix is false positive. Disabled linters on files that are hard (i18n/polib.py) to fix, or less interesting to fix (hgsubversion tests), or cannot be fixed without breaking OSS build (FBPYTHON4). Conflicted linters (test-check-module-imports.t, part of test-check-code.t, test-check-pyflakes.t) are removed or disabled. Duplicated linters (test-check-pyflakes.t, test-check-pylint.t) are removed. An issue of the auto-formatter is lines are no longer guarnateed to be <= 80 chars. But that seems less important comparing with the benefit auto-formatter provides. As we're here, also remove test-check-py3-compat.t, as it is currently broken if `PYTHON3=/bin/python3` is set. Reviewed By: wez, phillco, simpkins, pkaush, singhsrb Differential Revision: D8173629 fbshipit-source-id: 90e248ae0c5e6eaadbe25520a6ee42d32005621b
77 lines
2.4 KiB
Python
77 lines
2.4 KiB
Python
# arcdiff.py - extension adding an option to the diff command to show changes
|
|
# since the last arcanist diff
|
|
#
|
|
# Copyright 2016 Facebook, Inc.
|
|
#
|
|
# This software may be used and distributed according to the terms of the
|
|
# GNU General Public License version 2 or any later version.
|
|
|
|
import os
|
|
|
|
from mercurial import commands, error, extensions
|
|
from mercurial.i18n import _
|
|
|
|
from .extlib.phabricator import arcconfig, diffprops, graphql
|
|
|
|
|
|
def extsetup(ui):
|
|
entry = extensions.wrapcommand(commands.table, "diff", _diff)
|
|
options = entry[1]
|
|
options.append(
|
|
("", "since-last-arc-diff", None, _("show changes since last `arc diff`"))
|
|
)
|
|
|
|
|
|
def _differentialhash(ui, repo, phabrev):
|
|
timeout = repo.ui.configint("ssl", "timeout", 5)
|
|
ca_certs = repo.ui.configpath("web", "cacerts")
|
|
try:
|
|
client = graphql.Client(repodir=repo.root, ca_bundle=ca_certs, repo=repo)
|
|
info = client.getrevisioninfo(timeout, [phabrev]).get(str(phabrev))
|
|
if not info:
|
|
return None
|
|
return info
|
|
|
|
except graphql.ClientError as e:
|
|
ui.warn(_("Error calling graphql: %s\n") % str(e))
|
|
return None
|
|
except arcconfig.ArcConfigError as e:
|
|
raise error.Abort(str(e))
|
|
|
|
|
|
def _diff(orig, ui, repo, *pats, **opts):
|
|
if not opts.get("since_last_arc_diff"):
|
|
return orig(ui, repo, *pats, **opts)
|
|
|
|
if len(opts["rev"]) > 1:
|
|
mess = _("cannot specify --since-last-arc-diff with multiple revisions")
|
|
raise error.Abort(mess)
|
|
try:
|
|
targetrev = opts["rev"][0]
|
|
except IndexError:
|
|
targetrev = "."
|
|
ctx = repo[targetrev]
|
|
phabrev = diffprops.parserevfromcommitmsg(ctx.description())
|
|
|
|
if phabrev is None:
|
|
mess = _("local changeset is not associated with a differential " "revision")
|
|
raise error.Abort(mess)
|
|
|
|
rev = _differentialhash(ui, repo, phabrev)
|
|
|
|
if rev is None or not isinstance(rev, dict) or "hash" not in rev:
|
|
mess = _("unable to determine previous changeset hash")
|
|
raise error.Abort(mess)
|
|
|
|
rev = str(rev["hash"])
|
|
opts["rev"] = [rev, targetrev]
|
|
|
|
# if patterns aren't provided, restrict diff to files in both changesets
|
|
# this prevents performing a diff on rebased changes
|
|
if len(pats) == 0:
|
|
prev = set(repo.unfiltered()[rev].files())
|
|
curr = set(repo[targetrev].files())
|
|
pats = tuple(os.path.join(repo.root, p) for p in prev | curr)
|
|
|
|
return orig(ui, repo, *pats, **opts)
|