Mercurial > hg-stable
changeset 37186:0024961aa493
contrib: rename clang-format-blacklist to clang-format-ignorelist
"blacklist" is racially charged. Let's rename it to something
that isn't.
Differential Revision: https://phab.mercurial-scm.org/D2974
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Fri, 30 Mar 2018 11:35:17 -0700 |
| parents | ded5ea279a93 |
| children | 027db60ae756 |
| files | Makefile contrib/clang-format-blacklist contrib/clang-format-ignorelist tests/test-check-clang-format.t |
| diffstat | 4 files changed, 71 insertions(+), 71 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Sat Mar 03 14:08:44 2018 -0800 +++ b/Makefile Fri Mar 30 11:35:17 2018 -0700 @@ -124,7 +124,7 @@ format-c: clang-format --style file -i \ - `hg files 'set:(**.c or **.cc or **.h) and not "listfile:contrib/clang-format-blacklist"'` + `hg files 'set:(**.c or **.cc or **.h) and not "listfile:contrib/clang-format-ignorelist"'` update-pot: i18n/hg.pot
--- a/contrib/clang-format-blacklist Sat Mar 03 14:08:44 2018 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,69 +0,0 @@ -# Files that just need to be migrated to the formatter. -# Do not add new files here! -mercurial/cext/dirs.c -mercurial/cext/manifest.c -mercurial/cext/osutil.c -mercurial/cext/revlog.c -# Vendored code that we should never format: -contrib/python-zstandard/c-ext/bufferutil.c -contrib/python-zstandard/c-ext/compressiondict.c -contrib/python-zstandard/c-ext/compressionparams.c -contrib/python-zstandard/c-ext/compressionwriter.c -contrib/python-zstandard/c-ext/compressobj.c -contrib/python-zstandard/c-ext/compressor.c -contrib/python-zstandard/c-ext/compressoriterator.c -contrib/python-zstandard/c-ext/constants.c -contrib/python-zstandard/c-ext/decompressionwriter.c -contrib/python-zstandard/c-ext/decompressobj.c -contrib/python-zstandard/c-ext/decompressor.c -contrib/python-zstandard/c-ext/decompressoriterator.c -contrib/python-zstandard/c-ext/frameparams.c -contrib/python-zstandard/c-ext/python-zstandard.h -contrib/python-zstandard/zstd.c -contrib/python-zstandard/zstd/common/bitstream.h -contrib/python-zstandard/zstd/common/entropy_common.c -contrib/python-zstandard/zstd/common/error_private.c -contrib/python-zstandard/zstd/common/error_private.h -contrib/python-zstandard/zstd/common/fse.h -contrib/python-zstandard/zstd/common/fse_decompress.c -contrib/python-zstandard/zstd/common/huf.h -contrib/python-zstandard/zstd/common/mem.h -contrib/python-zstandard/zstd/common/pool.c -contrib/python-zstandard/zstd/common/pool.h -contrib/python-zstandard/zstd/common/threading.c -contrib/python-zstandard/zstd/common/threading.h -contrib/python-zstandard/zstd/common/xxhash.c -contrib/python-zstandard/zstd/common/xxhash.h -contrib/python-zstandard/zstd/common/zstd_common.c -contrib/python-zstandard/zstd/common/zstd_errors.h -contrib/python-zstandard/zstd/common/zstd_internal.h -contrib/python-zstandard/zstd/compress/fse_compress.c -contrib/python-zstandard/zstd/compress/huf_compress.c -contrib/python-zstandard/zstd/compress/zstd_compress.c -contrib/python-zstandard/zstd/compress/zstd_opt.h -contrib/python-zstandard/zstd/compress/zstdmt_compress.c -contrib/python-zstandard/zstd/compress/zstdmt_compress.h -contrib/python-zstandard/zstd/decompress/huf_decompress.c -contrib/python-zstandard/zstd/decompress/zstd_decompress.c -contrib/python-zstandard/zstd/dictBuilder/cover.c -contrib/python-zstandard/zstd/dictBuilder/divsufsort.c -contrib/python-zstandard/zstd/dictBuilder/divsufsort.h -contrib/python-zstandard/zstd/dictBuilder/zdict.c -contrib/python-zstandard/zstd/dictBuilder/zdict.h -contrib/python-zstandard/zstd/zstd.h -hgext/fsmonitor/pywatchman/bser.c -mercurial/thirdparty/xdiff/xdiff.h -mercurial/thirdparty/xdiff/xdiffi.c -mercurial/thirdparty/xdiff/xdiffi.h -mercurial/thirdparty/xdiff/xemit.c -mercurial/thirdparty/xdiff/xemit.h -mercurial/thirdparty/xdiff/xhistogram.c -mercurial/thirdparty/xdiff/xinclude.h -mercurial/thirdparty/xdiff/xmacros.h -mercurial/thirdparty/xdiff/xmerge.c -mercurial/thirdparty/xdiff/xpatience.c -mercurial/thirdparty/xdiff/xprepare.c -mercurial/thirdparty/xdiff/xprepare.h -mercurial/thirdparty/xdiff/xtypes.h -mercurial/thirdparty/xdiff/xutils.c -mercurial/thirdparty/xdiff/xutils.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/contrib/clang-format-ignorelist Fri Mar 30 11:35:17 2018 -0700 @@ -0,0 +1,69 @@ +# Files that just need to be migrated to the formatter. +# Do not add new files here! +mercurial/cext/dirs.c +mercurial/cext/manifest.c +mercurial/cext/osutil.c +mercurial/cext/revlog.c +# Vendored code that we should never format: +contrib/python-zstandard/c-ext/bufferutil.c +contrib/python-zstandard/c-ext/compressiondict.c +contrib/python-zstandard/c-ext/compressionparams.c +contrib/python-zstandard/c-ext/compressionwriter.c +contrib/python-zstandard/c-ext/compressobj.c +contrib/python-zstandard/c-ext/compressor.c +contrib/python-zstandard/c-ext/compressoriterator.c +contrib/python-zstandard/c-ext/constants.c +contrib/python-zstandard/c-ext/decompressionwriter.c +contrib/python-zstandard/c-ext/decompressobj.c +contrib/python-zstandard/c-ext/decompressor.c +contrib/python-zstandard/c-ext/decompressoriterator.c +contrib/python-zstandard/c-ext/frameparams.c +contrib/python-zstandard/c-ext/python-zstandard.h +contrib/python-zstandard/zstd.c +contrib/python-zstandard/zstd/common/bitstream.h +contrib/python-zstandard/zstd/common/entropy_common.c +contrib/python-zstandard/zstd/common/error_private.c +contrib/python-zstandard/zstd/common/error_private.h +contrib/python-zstandard/zstd/common/fse.h +contrib/python-zstandard/zstd/common/fse_decompress.c +contrib/python-zstandard/zstd/common/huf.h +contrib/python-zstandard/zstd/common/mem.h +contrib/python-zstandard/zstd/common/pool.c +contrib/python-zstandard/zstd/common/pool.h +contrib/python-zstandard/zstd/common/threading.c +contrib/python-zstandard/zstd/common/threading.h +contrib/python-zstandard/zstd/common/xxhash.c +contrib/python-zstandard/zstd/common/xxhash.h +contrib/python-zstandard/zstd/common/zstd_common.c +contrib/python-zstandard/zstd/common/zstd_errors.h +contrib/python-zstandard/zstd/common/zstd_internal.h +contrib/python-zstandard/zstd/compress/fse_compress.c +contrib/python-zstandard/zstd/compress/huf_compress.c +contrib/python-zstandard/zstd/compress/zstd_compress.c +contrib/python-zstandard/zstd/compress/zstd_opt.h +contrib/python-zstandard/zstd/compress/zstdmt_compress.c +contrib/python-zstandard/zstd/compress/zstdmt_compress.h +contrib/python-zstandard/zstd/decompress/huf_decompress.c +contrib/python-zstandard/zstd/decompress/zstd_decompress.c +contrib/python-zstandard/zstd/dictBuilder/cover.c +contrib/python-zstandard/zstd/dictBuilder/divsufsort.c +contrib/python-zstandard/zstd/dictBuilder/divsufsort.h +contrib/python-zstandard/zstd/dictBuilder/zdict.c +contrib/python-zstandard/zstd/dictBuilder/zdict.h +contrib/python-zstandard/zstd/zstd.h +hgext/fsmonitor/pywatchman/bser.c +mercurial/thirdparty/xdiff/xdiff.h +mercurial/thirdparty/xdiff/xdiffi.c +mercurial/thirdparty/xdiff/xdiffi.h +mercurial/thirdparty/xdiff/xemit.c +mercurial/thirdparty/xdiff/xemit.h +mercurial/thirdparty/xdiff/xhistogram.c +mercurial/thirdparty/xdiff/xinclude.h +mercurial/thirdparty/xdiff/xmacros.h +mercurial/thirdparty/xdiff/xmerge.c +mercurial/thirdparty/xdiff/xpatience.c +mercurial/thirdparty/xdiff/xprepare.c +mercurial/thirdparty/xdiff/xprepare.h +mercurial/thirdparty/xdiff/xtypes.h +mercurial/thirdparty/xdiff/xutils.c +mercurial/thirdparty/xdiff/xutils.h
--- a/tests/test-check-clang-format.t Sat Mar 03 14:08:44 2018 -0800 +++ b/tests/test-check-clang-format.t Fri Mar 30 11:35:17 2018 -0700 @@ -3,7 +3,7 @@ $ . "$TESTDIR/helpers-testrepo.sh" $ cd "$TESTDIR"/.. - $ for f in `testrepohg files 'set:(**.c or **.cc or **.h) and not "listfile:contrib/clang-format-blacklist"'` ; do + $ for f in `testrepohg files 'set:(**.c or **.cc or **.h) and not "listfile:contrib/clang-format-ignorelist"'` ; do > clang-format --style file $f > $f.formatted > cmp $f $f.formatted || diff -u $f $f.formatted > rm $f.formatted