This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10185

black: merge config into main pyproject.toml now that we have it
ClosedPublic

Authored by durin42 on Mar 12 2021, 1:20 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGdecc3bd3f20d: black: merge config into main pyproject.toml now that we have it
Summary

This means that naive contributors who just run black on a source file
will get reasonable behavior as long as they have a recent black. Yay!

This was previously D9834 but was rolled back due to test
failures. nbjoerg thinks it's time to try again, so let's give it a
shot.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

durin42 created this revision.Mar 12 2021, 1:20 PM
pulkit accepted this revision.Mar 17 2021, 9:51 AM
This revision is now accepted and ready to land.Mar 17 2021, 9:51 AM

Revision Contents
Changeset List

PathPackages
DMblack.toml (14 lines)
Mcontrib/examples/fix.hgrc (2 lines)
Mpyproject.toml (15 lines)
Mtests/test-check-code.t (1 line)
Mtests/test-check-format.t (2 lines)

Diff 26481

black.toml

  • This file was deleted.
[tool.black]
line-length = 80
exclude = '''
build/
| wheelhouse/
| dist/
| packages/
| \.hg/
| \.mypy_cache/
| \.venv/
| mercurial/thirdparty/
'''
skip-string-normalization = true
quiet = true

contrib/examples/fix.hgrc

[fix] [fix]
clang-format:command = clang-format --style file clang-format:command = clang-format --style file
clang-format:pattern = set:(**.c or **.cc or **.h) and not "include:contrib/clang-format-ignorelist" clang-format:pattern = set:(**.c or **.cc or **.h) and not "include:contrib/clang-format-ignorelist"
rustfmt:command = rustfmt +nightly rustfmt:command = rustfmt +nightly
rustfmt:pattern = set:"**.rs" - "mercurial/thirdparty/**" rustfmt:pattern = set:"**.rs" - "mercurial/thirdparty/**"
black:command = black --config=black.toml - black:command = black
black:pattern = set:**.py - mercurial/thirdparty/** black:pattern = set:**.py - mercurial/thirdparty/**
# Mercurial doesn't have any Go code, but if we did this is how we # Mercurial doesn't have any Go code, but if we did this is how we
# would configure `hg fix` for Go: # would configure `hg fix` for Go:
go:command = gofmt go:command = gofmt
go:pattern = set:**.go go:pattern = set:**.go

pyproject.toml

[build-system] [build-system]
requires = ["setuptools", "wheel"] requires = ["setuptools", "wheel"]
build-backend = "setuptools.build_meta" build-backend = "setuptools.build_meta"
[tool.black]
line-length = 80
exclude = '''
build/
| wheelhouse/
| dist/
| packages/
| \.hg/
| \.mypy_cache/
| \.venv/
| mercurial/thirdparty/
'''
skip-string-normalization = true
quiet = true

tests/test-check-code.t

.hgsigs .hgsigs
.hgtags .hgtags
.jshintrc .jshintrc
CONTRIBUTING CONTRIBUTING
CONTRIBUTORS CONTRIBUTORS
COPYING COPYING
Makefile Makefile
README.rst README.rst
black.toml
hg hg
hgeditor hgeditor
hgweb.cgi hgweb.cgi
pyproject.toml pyproject.toml
rustfmt.toml rustfmt.toml
setup.py setup.py
Prevent adding modules which could be shadowed by ancient .so/.dylib. Prevent adding modules which could be shadowed by ancient .so/.dylib.

tests/test-check-format.t

#require black test-repo #require black test-repo
$ cd $RUNTESTDIR/.. $ cd $RUNTESTDIR/..
$ black --config=black.toml --check --diff `hg files 'set:(**.py + grep("^#!.*python")) - mercurial/thirdparty/**'` $ black --check --diff `hg files 'set:(**.py + grep("^#!.*python")) - mercurial/thirdparty/**'`