Adjust blocked_terms and unblocked_terms lists
There are some terms that are already sufficiently rare in use today that we
should be able to block them globally, this patch does so and adjusts the text
in the terms files to account for it.
We enable blocking for:
black.?hat # 3 instances across 2 repos remain
first.?class.?citizen # 40 instances across 15 repos remain
grandfathered # 4 instances across 4 repos remain
gr[ae]y.?hat # 0 instances!
white.?glove # 0 instances!
white.?hat # 0 instances!
BUG=None
TEST=Verified a CL with these now blocked terms fails presubmit, but other
unblocked terms do not.
Change-Id: I21bafa181cf31516cc86d20f0c8a3e276599a747
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/repohooks/+/2406757
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Bernie Thompson <bhthompson@chromium.org>
Tested-by: Bernie Thompson <bhthompson@chromium.org>
Auto-Submit: Bernie Thompson <bhthompson@chromium.org>
diff --git a/blocked_terms.txt b/blocked_terms.txt
index 7f0134d..544013a 100644
--- a/blocked_terms.txt
+++ b/blocked_terms.txt
@@ -1,13 +1,7 @@
-# DELETE THIS COMMENT IN YOUR COPY.
-#
-# This is the global list of words to be blocked. unblocked_terms.txt has the
-# same contents. Copy unblocked_terms.txt to your project to enable repo hook to
-# block the words.
-
-# KEEP THIS COMMENT IN YOUR COPY.
-#
-# Don't delete this file if you want to keep keyword_check enabled even if it's
-# empty. See repohooks/README.md for more details.
+# This is the global list of words to be blocked. unblocked_terms.txt has
+# terms that are too commonly used still and are in the process of being
+# cleaned from the codebase. Copy unblocked_terms.txt to your project and
+# start commenting out terms to enable the repo hook to block the words.
black.?hat
black.?list
diff --git a/unblocked_terms.txt b/unblocked_terms.txt
index 7f0134d..df8af67 100644
--- a/unblocked_terms.txt
+++ b/unblocked_terms.txt
@@ -1,23 +1,28 @@
# DELETE THIS COMMENT IN YOUR COPY.
#
-# This is the global list of words to be blocked. unblocked_terms.txt has the
-# same contents. Copy unblocked_terms.txt to your project to enable repo hook to
-# block the words.
+# This is the global list of words which are still too commonly used in the
+# codebase to be blocked outright. This list will continue to shrink as the
+# codebase moves away from the use of these terms.
+#
+# Copy this file to your project and comment more words to enable the repo hook
+# to block the words.
# KEEP THIS COMMENT IN YOUR COPY.
#
# Don't delete this file if you want to keep keyword_check enabled even if it's
-# empty. See repohooks/README.md for more details.
+# empty.
+#
+# See repohooks/README.md for more details.
-black.?hat
+# black.?hat
black.?list
build.?cop
crazy
cripple
dummy
-first.?class.?citizen
-grandfathered
-gr[ae]y.?hat
+# first.?class.?citizen
+# grandfathered
+# gr[ae]y.?hat
gr[ae]y.?list
insane
\bhe\b
@@ -35,8 +40,8 @@
sane
sanity
slave
-white.?glove
-white.?hat
+# white.?glove
+# white.?hat
white.?label
white.?list
wtf
