Patchwork [1,of,3,STABLE] contrib: fix up example fix configuration for our move to released black

login
register
mail settings
Submitter Augie Fackler
Date Oct. 30, 2019, 8:39 p.m.
Message ID <0dc1b2cc8e1784b05972.1572467985@augie-macbookpro2.roam.corp.google.com>
Download mbox | patch
Permalink /patch/42619/
State Accepted
Headers show

Comments

Augie Fackler - Oct. 30, 2019, 8:39 p.m.
# HG changeset patch
# User Augie Fackler <augie@google.com>
# Date 1572466659 14400
#      Wed Oct 30 16:17:39 2019 -0400
# Branch stable
# Node ID 0dc1b2cc8e1784b059728c9d9decaf58a50937ae
# Parent  2278f79e85e96a5ca389f77c47d92a3dc9348443
contrib: fix up example fix configuration for our move to released black
Yuya Nishihara - Oct. 31, 2019, 1:09 p.m.
On Wed, 30 Oct 2019 16:39:45 -0400, Augie Fackler wrote:
> # HG changeset patch
> # User Augie Fackler <augie@google.com>
> # Date 1572466659 14400
> #      Wed Oct 30 16:17:39 2019 -0400
> # Branch stable
> # Node ID 0dc1b2cc8e1784b059728c9d9decaf58a50937ae
> # Parent  2278f79e85e96a5ca389f77c47d92a3dc9348443
> contrib: fix up example fix configuration for our move to released black

Queued for stable, thanks.

Patch

diff --git a/contrib/examples/fix.hgrc b/contrib/examples/fix.hgrc
--- a/contrib/examples/fix.hgrc
+++ b/contrib/examples/fix.hgrc
@@ -5,11 +5,5 @@  clang-format:pattern = (**.c or **.cc or
 rustfmt:command = rustfmt {rootpath}
 rustfmt:pattern = set:**.rs
 
-# We use black, but currently with
-# https://github.com/psf/black/pull/826 applied. For now
-# contrib/grey.py is our fork of black. You need to pip install
-# git+https://github.com/python/black/@d9e71a75ccfefa3d9156a64c03313a0d4ad981e5
-# to have the dependencies for grey.
-#
-# black:command = python3.7 contrib/grey.py --config=black.toml -
-# black:pattern = set:**.py - hgext/fsmonitor/pywatchman/** - mercurial/thirdparty/** - "contrib/python-zstandard/** - contrib/grey.py"
+black:command = black --config=black.toml -
+black:pattern = set:**.py - hgext/fsmonitor/pywatchman/** - mercurial/thirdparty/** - "contrib/python-zstandard/**"