Rename the BlacklistPackagePrefix family of classes and their related functions.
Rename BlacklistPackagePrefix to IgnoredPackagePrefix to reflect the fact that
this comes from the bazelignore file in repositories. Update all code references
referring to the blacklist to use a new variable or method name to reflect the
new class name.
RELNOTES: None
PiperOrigin-RevId: 318117736
diff --git a/src/test/java/com/google/devtools/build/lib/packages/GlobCacheTest.java b/src/test/java/com/google/devtools/build/lib/packages/GlobCacheTest.java
index d437c1e..e2263af 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/GlobCacheTest.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/GlobCacheTest.java
@@ -91,12 +91,12 @@
createCache();
}
- private void createCache(PathFragment... blacklistedDirectories) {
+ private void createCache(PathFragment... ignoredDirectories) {
cache =
new GlobCache(
packageDirectory,
PackageIdentifier.createInMainRepo("isolated"),
- ImmutableSet.copyOf(blacklistedDirectories),
+ ImmutableSet.copyOf(ignoredDirectories),
new CachingPackageLocator() {
@Override
public Path getBuildFileForPackage(PackageIdentifier packageId) {
@@ -121,7 +121,7 @@
}
@Test
- public void testBlacklistedDirectory() throws Exception {
+ public void testIgnoredDirectory() throws Exception {
createCache(PathFragment.create("isolated/foo"));
List<Path> paths = cache.safeGlobUnsorted("**/*.js", true).get();
assertPathsAre(
diff --git a/src/test/java/com/google/devtools/build/lib/query2/testutil/AbstractQueryTest.java b/src/test/java/com/google/devtools/build/lib/query2/testutil/AbstractQueryTest.java
index 8df2c38..6e42e8e 100644
--- a/src/test/java/com/google/devtools/build/lib/query2/testutil/AbstractQueryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/query2/testutil/AbstractQueryTest.java
@@ -1829,7 +1829,7 @@
Path getRootDirectory();
- PathFragment getBlacklistedPackagePrefixesFile();
+ PathFragment getIgnoredPackagePrefixesFile();
/** Removes all files below the package root. */
void clearAllFiles() throws IOException;
diff --git a/src/test/java/com/google/devtools/build/lib/query2/testutil/BUILD b/src/test/java/com/google/devtools/build/lib/query2/testutil/BUILD
index 4f2565c..bf795ac 100644
--- a/src/test/java/com/google/devtools/build/lib/query2/testutil/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/query2/testutil/BUILD
@@ -38,7 +38,7 @@
"//src/main/java/com/google/devtools/build/lib/query2/common:abstract-blaze-query-env",
"//src/main/java/com/google/devtools/build/lib/query2/engine",
"//src/main/java/com/google/devtools/build/lib/rules:repository/repository_function",
- "//src/main/java/com/google/devtools/build/lib/skyframe:blacklisted_package_prefixes_function",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:ignored_package_prefixes_function",
"//src/main/java/com/google/devtools/build/lib/skyframe:package_value",
"//src/main/java/com/google/devtools/build/lib/skyframe:precomputed_value",
"//src/main/java/com/google/devtools/build/lib/skyframe:skyframe_cluster",
diff --git a/src/test/java/com/google/devtools/build/lib/query2/testutil/PostAnalysisQueryHelper.java b/src/test/java/com/google/devtools/build/lib/query2/testutil/PostAnalysisQueryHelper.java
index cba59f8..e45f4c5 100644
--- a/src/test/java/com/google/devtools/build/lib/query2/testutil/PostAnalysisQueryHelper.java
+++ b/src/test/java/com/google/devtools/build/lib/query2/testutil/PostAnalysisQueryHelper.java
@@ -125,7 +125,7 @@
}
@Override
- public PathFragment getBlacklistedPackagePrefixesFile() {
+ public PathFragment getIgnoredPackagePrefixesFile() {
return PathFragment.EMPTY_FRAGMENT;
}
diff --git a/src/test/java/com/google/devtools/build/lib/query2/testutil/SkyframeQueryHelper.java b/src/test/java/com/google/devtools/build/lib/query2/testutil/SkyframeQueryHelper.java
index 152ba2f..69ac754 100644
--- a/src/test/java/com/google/devtools/build/lib/query2/testutil/SkyframeQueryHelper.java
+++ b/src/test/java/com/google/devtools/build/lib/query2/testutil/SkyframeQueryHelper.java
@@ -51,7 +51,7 @@
import com.google.devtools.build.lib.query2.engine.ThreadSafeOutputFormatterCallback;
import com.google.devtools.build.lib.rules.repository.RepositoryDelegatorFunction;
import com.google.devtools.build.lib.skyframe.BazelSkyframeExecutorConstants;
-import com.google.devtools.build.lib.skyframe.BlacklistedPackagePrefixesFunction;
+import com.google.devtools.build.lib.skyframe.IgnoredPackagePrefixesFunction;
import com.google.devtools.build.lib.skyframe.PackageValue;
import com.google.devtools.build.lib.skyframe.PrecomputedValue;
import com.google.devtools.build.lib.skyframe.SkyframeExecutor;
@@ -94,7 +94,7 @@
private boolean blockUniverseEvaluationErrors;
protected final ActionKeyContext actionKeyContext = new ActionKeyContext();
- private final PathFragment blacklistedPackagePrefixesFile = PathFragment.create("blacklist");
+ private final PathFragment ignoredPackagePrefixesFile = PathFragment.create("ignored");
@Override
public void setUp() throws Exception {
@@ -136,8 +136,8 @@
}
@Override
- public PathFragment getBlacklistedPackagePrefixesFile() {
- return blacklistedPackagePrefixesFile;
+ public PathFragment getIgnoredPackagePrefixesFile() {
+ return ignoredPackagePrefixesFile;
}
@Override
@@ -314,8 +314,8 @@
.setDirectories(directories)
.setActionKeyContext(actionKeyContext)
.setDefaultBuildOptions(getDefaultBuildOptions(ruleClassProvider))
- .setBlacklistedPackagePrefixesFunction(
- new BlacklistedPackagePrefixesFunction(blacklistedPackagePrefixesFile))
+ .setIgnoredPackagePrefixesFunction(
+ new IgnoredPackagePrefixesFunction(ignoredPackagePrefixesFile))
.setExtraSkyFunctions(analysisMock.getSkyFunctions(directories))
.build();
skyframeExecutor.injectExtraPrecomputedValues(
diff --git a/src/test/java/com/google/devtools/build/lib/rules/repository/BUILD b/src/test/java/com/google/devtools/build/lib/rules/repository/BUILD
index 41ec961..0e3e674 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/repository/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/rules/repository/BUILD
@@ -31,9 +31,9 @@
"//src/main/java/com/google/devtools/build/lib/rules:repository/repository_directory_value",
"//src/main/java/com/google/devtools/build/lib/rules:repository/repository_function",
"//src/main/java/com/google/devtools/build/lib/rules:repository/repository_loader_function",
- "//src/main/java/com/google/devtools/build/lib/skyframe:blacklisted_package_prefixes_function",
"//src/main/java/com/google/devtools/build/lib/skyframe:containing_package_lookup_function",
"//src/main/java/com/google/devtools/build/lib/skyframe:file_function",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:ignored_package_prefixes_function",
"//src/main/java/com/google/devtools/build/lib/skyframe:managed_directories_knowledge",
"//src/main/java/com/google/devtools/build/lib/skyframe:package_lookup_function",
"//src/main/java/com/google/devtools/build/lib/skyframe:precomputed_function",
diff --git a/src/test/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorTest.java b/src/test/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorTest.java
index 6f91c54..2273e17 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorTest.java
@@ -41,7 +41,6 @@
import com.google.devtools.build.lib.rules.repository.RepositoryDirectoryValue.SuccessfulRepositoryDirectoryValue;
import com.google.devtools.build.lib.skyframe.ASTFileLookupFunction;
import com.google.devtools.build.lib.skyframe.BazelSkyframeExecutorConstants;
-import com.google.devtools.build.lib.skyframe.BlacklistedPackagePrefixesFunction;
import com.google.devtools.build.lib.skyframe.BzlLoadFunction;
import com.google.devtools.build.lib.skyframe.ContainingPackageLookupFunction;
import com.google.devtools.build.lib.skyframe.ExternalFilesHelper;
@@ -49,6 +48,7 @@
import com.google.devtools.build.lib.skyframe.ExternalPackageFunction;
import com.google.devtools.build.lib.skyframe.FileFunction;
import com.google.devtools.build.lib.skyframe.FileStateFunction;
+import com.google.devtools.build.lib.skyframe.IgnoredPackagePrefixesFunction;
import com.google.devtools.build.lib.skyframe.LocalRepositoryLookupFunction;
import com.google.devtools.build.lib.skyframe.ManagedDirectoriesKnowledge;
import com.google.devtools.build.lib.skyframe.PackageFunction;
@@ -208,9 +208,9 @@
CacheBuilder.newBuilder().build()))
.put(SkyFunctions.CONTAINING_PACKAGE_LOOKUP, new ContainingPackageLookupFunction())
.put(
- SkyFunctions.BLACKLISTED_PACKAGE_PREFIXES,
- new BlacklistedPackagePrefixesFunction(
- /*blacklistedPackagePrefixesFile=*/ PathFragment.EMPTY_FRAGMENT))
+ SkyFunctions.IGNORED_PACKAGE_PREFIXES,
+ new IgnoredPackagePrefixesFunction(
+ /*ignoredPackagePrefixesFile=*/ PathFragment.EMPTY_FRAGMENT))
.put(SkyFunctions.RESOLVED_HASH_VALUES, new ResolvedHashesFunction())
.build(),
differencer);
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/BUILD b/src/test/java/com/google/devtools/build/lib/skyframe/BUILD
index eb983c6..d530430 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/BUILD
@@ -168,7 +168,7 @@
"//src/main/java/com/google/devtools/build/lib/skyframe:artifact_function",
"//src/main/java/com/google/devtools/build/lib/skyframe:aspect_value_key",
"//src/main/java/com/google/devtools/build/lib/skyframe:ast_file_lookup_value",
- "//src/main/java/com/google/devtools/build/lib/skyframe:blacklisted_package_prefixes_function",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:ignored_package_prefixes_function",
"//src/main/java/com/google/devtools/build/lib/skyframe:broken_diff_awareness_exception",
"//src/main/java/com/google/devtools/build/lib/skyframe:build_configuration_value",
"//src/main/java/com/google/devtools/build/lib/skyframe:builder",
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ContainingPackageLookupFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/ContainingPackageLookupFunctionTest.java
index ab98e0e..f337404 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/ContainingPackageLookupFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/ContainingPackageLookupFunctionTest.java
@@ -114,9 +114,9 @@
skyFunctions.put(
SkyFunctions.PACKAGE, new PackageFunction(null, null, null, null, null, null, null, null));
skyFunctions.put(
- SkyFunctions.BLACKLISTED_PACKAGE_PREFIXES,
- new BlacklistedPackagePrefixesFunction(
- /*blacklistedPackagePrefixesFile=*/ PathFragment.EMPTY_FRAGMENT));
+ SkyFunctions.IGNORED_PACKAGE_PREFIXES,
+ new IgnoredPackagePrefixesFunction(
+ /*ignoredPackagePrefixesFile=*/ PathFragment.EMPTY_FRAGMENT));
skyFunctions.put(
FileStateValue.FILE_STATE,
new FileStateFunction(
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunctionTest.java
index 641ff27..77abd13 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunctionTest.java
@@ -128,9 +128,9 @@
BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY,
BazelSkyframeExecutorConstants.EXTERNAL_PACKAGE_HELPER));
skyFunctions.put(
- SkyFunctions.BLACKLISTED_PACKAGE_PREFIXES,
- new BlacklistedPackagePrefixesFunction(
- /*blacklistedPackagePrefixesFile=*/ PathFragment.EMPTY_FRAGMENT));
+ SkyFunctions.IGNORED_PACKAGE_PREFIXES,
+ new IgnoredPackagePrefixesFunction(
+ /*ignoredPackagePrefixesFile=*/ PathFragment.EMPTY_FRAGMENT));
skyFunctions.put(
SkyFunctions.FILESET_ENTRY, new FilesetEntryFunction((unused) -> rootDirectory));
skyFunctions.put(SkyFunctions.WORKSPACE_NAME, new TestWorkspaceNameFunction());
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/GlobFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/GlobFunctionTest.java
index 5140f3e..a24851f 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/GlobFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/GlobFunctionTest.java
@@ -172,8 +172,8 @@
BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY,
BazelSkyframeExecutorConstants.EXTERNAL_PACKAGE_HELPER));
skyFunctions.put(
- SkyFunctions.BLACKLISTED_PACKAGE_PREFIXES,
- BazelSkyframeExecutorConstants.BLACKLISTED_PACKAGE_PREFIXES_FUNCTION);
+ SkyFunctions.IGNORED_PACKAGE_PREFIXES,
+ BazelSkyframeExecutorConstants.IGNORED_PACKAGE_PREFIXES_FUNCTION);
skyFunctions.put(
FileStateValue.FILE_STATE,
new FileStateFunction(
@@ -233,7 +233,7 @@
}
@Test
- public void testBlacklist() throws Exception {
+ public void testIgnoreList() throws Exception {
FileSystemUtils.writeContentAsLatin1(root.getRelative(".bazelignore"), "pkg/foo/bar");
assertGlobMatches("foo/**", "foo/barnacle/wiz", "foo/barnacle", "foo");
differencer.invalidate(
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java
index 0618e7f..efdd982 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java
@@ -84,8 +84,7 @@
private SequentialBuildDriver driver;
private RecordingDifferencer differencer;
private Path emptyPackagePath;
- private static final String BLACKLISTED_PACKAGE_PREFIXES_FILE_PATH_STRING =
- "config/blacklisted.txt";
+ private static final String IGNORED_PACKAGE_PREFIXES_FILE_PATH_STRING = "config/ignored.txt";
protected abstract CrossRepositoryLabelViolationStrategy crossRepositoryLabelViolationStrategy();
@@ -134,9 +133,9 @@
new DirectoryListingStateFunction(
externalFilesHelper, new AtomicReference<>(UnixGlob.DEFAULT_SYSCALLS)));
skyFunctions.put(
- SkyFunctions.BLACKLISTED_PACKAGE_PREFIXES,
- new BlacklistedPackagePrefixesFunction(
- PathFragment.create(BLACKLISTED_PACKAGE_PREFIXES_FILE_PATH_STRING)));
+ SkyFunctions.IGNORED_PACKAGE_PREFIXES,
+ new IgnoredPackagePrefixesFunction(
+ PathFragment.create(IGNORED_PACKAGE_PREFIXES_FILE_PATH_STRING)));
RuleClassProvider ruleClassProvider = analysisMock.createRuleClassProvider();
skyFunctions.put(SkyFunctions.WORKSPACE_AST, new WorkspaceASTFunction(ruleClassProvider));
skyFunctions.put(
@@ -238,13 +237,12 @@
}
@Test
- public void testBlacklistedPackage() throws Exception {
- scratch.file("blacklisted/subdir/BUILD");
- scratch.file("blacklisted/BUILD");
- Path blacklist =
- scratch.overwriteFile(BLACKLISTED_PACKAGE_PREFIXES_FILE_PATH_STRING, "blacklisted");
+ public void testIgnoredPackage() throws Exception {
+ scratch.file("ignored/subdir/BUILD");
+ scratch.file("ignored/BUILD");
+ Path ignored = scratch.overwriteFile(IGNORED_PACKAGE_PREFIXES_FILE_PATH_STRING, "ignored");
- ImmutableSet<String> pkgs = ImmutableSet.of("blacklisted/subdir", "blacklisted");
+ ImmutableSet<String> pkgs = ImmutableSet.of("ignored/subdir", "ignored");
for (String pkg : pkgs) {
PackageLookupValue packageLookupValue = lookupPackage(pkg);
assertThat(packageLookupValue.packageExists()).isFalse();
@@ -252,12 +250,12 @@
assertThat(packageLookupValue.getErrorMsg()).isNotNull();
}
- scratch.overwriteFile(BLACKLISTED_PACKAGE_PREFIXES_FILE_PATH_STRING, "not_blacklisted");
- RootedPath rootedBlacklist =
+ scratch.overwriteFile(IGNORED_PACKAGE_PREFIXES_FILE_PATH_STRING, "not_ignored");
+ RootedPath rootedIgnoreFile =
RootedPath.toRootedPath(
- Root.fromPath(blacklist.getParentDirectory().getParentDirectory()),
- PathFragment.create("config/blacklisted.txt"));
- differencer.invalidate(ImmutableSet.of(FileStateValue.key(rootedBlacklist)));
+ Root.fromPath(ignored.getParentDirectory().getParentDirectory()),
+ PathFragment.create("config/ignored.txt"));
+ differencer.invalidate(ImmutableSet.of(FileStateValue.key(rootedIgnoreFile)));
for (String pkg : pkgs) {
PackageLookupValue packageLookupValue = lookupPackage(pkg);
assertThat(packageLookupValue.packageExists()).isTrue();
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternsFunctionSmartNegationTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternsFunctionSmartNegationTest.java
index 4804249..cc95a91 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternsFunctionSmartNegationTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternsFunctionSmartNegationTest.java
@@ -59,8 +59,8 @@
@RunWith(JUnit4.class)
public class PrepareDepsOfPatternsFunctionSmartNegationTest extends FoundationTestCase {
private SkyframeExecutor skyframeExecutor;
- private static final String ADDITIONAL_BLACKLISTED_PACKAGE_PREFIXES_FILE_PATH_STRING =
- "config/blacklist.txt";
+ private static final String ADDITIONAL_IGNORED_PACKAGE_PREFIXES_FILE_PATH_STRING =
+ "config/ignored.txt";
private static SkyKey getKeyForLabel(Label label) {
// Note that these tests used to look for TargetMarker SkyKeys before TargetMarker was
@@ -95,9 +95,9 @@
.setDefaultBuildOptions(
DefaultBuildOptionsForTesting.getDefaultBuildOptionsForTest(ruleClassProvider))
.setExtraSkyFunctions(AnalysisMock.get().getSkyFunctions(directories))
- .setBlacklistedPackagePrefixesFunction(
- new BlacklistedPackagePrefixesFunction(
- PathFragment.create(ADDITIONAL_BLACKLISTED_PACKAGE_PREFIXES_FILE_PATH_STRING)))
+ .setIgnoredPackagePrefixesFunction(
+ new IgnoredPackagePrefixesFunction(
+ PathFragment.create(ADDITIONAL_IGNORED_PACKAGE_PREFIXES_FILE_PATH_STRING)))
.build();
SkyframeExecutorTestHelper.process(skyframeExecutor);
skyframeExecutor.preparePackageLoading(
@@ -122,7 +122,7 @@
PrecomputedValue.injected(
RepositoryDelegatorFunction.DEPENDENCY_FOR_UNCONDITIONAL_FETCHING,
RepositoryDelegatorFunction.DONT_FETCH_UNCONDITIONALLY)));
- scratch.file(ADDITIONAL_BLACKLISTED_PACKAGE_PREFIXES_FILE_PATH_STRING);
+ scratch.file(ADDITIONAL_IGNORED_PACKAGE_PREFIXES_FILE_PATH_STRING);
}
@Test
@@ -162,15 +162,15 @@
}
@Test
- public void testBlacklistPatternBlocksPatternEvaluation() throws Exception {
+ public void testIgnoredPatternBlocksPatternEvaluation() throws Exception {
// Given a well-formed package "//foo" and a malformed package "//foo/foo",
createFooAndFooFoo();
// Given a target pattern sequence consisting of a recursive pattern for "//foo/...",
ImmutableList<String> patternSequence = ImmutableList.of("//foo/...");
- // and a blacklist for the malformed package,
- scratch.overwriteFile(ADDITIONAL_BLACKLISTED_PACKAGE_PREFIXES_FILE_PATH_STRING, "foo/foo");
+ // and an ignored entry for the malformed package,
+ scratch.overwriteFile(ADDITIONAL_IGNORED_PACKAGE_PREFIXES_FILE_PATH_STRING, "foo/foo");
assertSkipsFoo(patternSequence);
}
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunctionTest.java
index 5ad20b5..4b03f6b 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunctionTest.java
@@ -159,9 +159,9 @@
BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY,
BazelSkyframeExecutorConstants.EXTERNAL_PACKAGE_HELPER));
skyFunctions.put(
- SkyFunctions.BLACKLISTED_PACKAGE_PREFIXES,
- new BlacklistedPackagePrefixesFunction(
- /*blacklistedPackagePrefixesFile=*/ PathFragment.EMPTY_FRAGMENT));
+ SkyFunctions.IGNORED_PACKAGE_PREFIXES,
+ new IgnoredPackagePrefixesFunction(
+ /*ignoredPackagePrefixesFile=*/ PathFragment.EMPTY_FRAGMENT));
skyFunctions.put(
SkyFunctions.PACKAGE, new PackageFunction(null, null, null, null, null, null, null, null));
skyFunctions.put(SkyFunctions.WORKSPACE_AST, new WorkspaceASTFunction(ruleClassProvider));
