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/main/java/com/google/devtools/build/lib/bazel/repository/starlark/BUILD b/src/main/java/com/google/devtools/build/lib/bazel/repository/starlark/BUILD
index 86fdc74..7ea01ad 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/repository/starlark/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/bazel/repository/starlark/BUILD
@@ -34,13 +34,12 @@
"//src/main/java/com/google/devtools/build/lib/rules:repository/workspace_attribute_mapper",
"//src/main/java/com/google/devtools/build/lib/rules:repository/workspace_file_helper",
"//src/main/java/com/google/devtools/build/lib/shell",
- "//src/main/java/com/google/devtools/build/lib/skyframe:blacklisted_package_prefixes_value",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:ignored_package_prefixes_value",
"//src/main/java/com/google/devtools/build/lib/skyframe:precomputed_value",
"//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/repository",
"//src/main/java/com/google/devtools/build/lib/syntax:evaluator",
"//src/main/java/com/google/devtools/build/lib/syntax:frontend",
"//src/main/java/com/google/devtools/build/lib/util",
- "//src/main/java/com/google/devtools/build/lib/util:os",
"//src/main/java/com/google/devtools/build/lib/util:string",
"//src/main/java/com/google/devtools/build/lib/util/io",
"//src/main/java/com/google/devtools/build/lib/util/io:out-err",
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/repository/starlark/StarlarkRepositoryContext.java b/src/main/java/com/google/devtools/build/lib/bazel/repository/starlark/StarlarkRepositoryContext.java
index 71d269b..5c220b9 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/repository/starlark/StarlarkRepositoryContext.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/repository/starlark/StarlarkRepositoryContext.java
@@ -107,7 +107,7 @@
private final Path outputDirectory;
private final StructImpl attrObject;
private final StarlarkOS osObject;
- private final ImmutableSet<PathFragment> blacklistedPatterns;
+ private final ImmutableSet<PathFragment> ignoredPatterns;
private final Environment env;
private final DownloadManager downloadManager;
private final double timeoutScaling;
@@ -124,7 +124,7 @@
Rule rule,
PathPackageLocator packageLocator,
Path outputDirectory,
- ImmutableSet<PathFragment> blacklistedPatterns,
+ ImmutableSet<PathFragment> ignoredPatterns,
Environment environment,
Map<String, String> env,
DownloadManager downloadManager,
@@ -137,7 +137,7 @@
this.rule = rule;
this.packageLocator = packageLocator;
this.outputDirectory = outputDirectory;
- this.blacklistedPatterns = blacklistedPatterns;
+ this.ignoredPatterns = ignoredPatterns;
this.env = environment;
this.osObject = new StarlarkOS(env);
this.downloadManager = downloadManager;
@@ -178,8 +178,8 @@
}
Path workspaceRoot = packageLocator.getWorkspaceFile().getParentDirectory();
PathFragment relativePath = path.relativeTo(workspaceRoot);
- for (PathFragment blacklistedPattern : blacklistedPatterns) {
- if (relativePath.startsWith(blacklistedPattern)) {
+ for (PathFragment ignoredPattern : ignoredPatterns) {
+ if (relativePath.startsWith(ignoredPattern)) {
return starlarkPath;
}
}
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/repository/starlark/StarlarkRepositoryFunction.java b/src/main/java/com/google/devtools/build/lib/bazel/repository/starlark/StarlarkRepositoryFunction.java
index f8151aa..2866ba7 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/repository/starlark/StarlarkRepositoryFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/repository/starlark/StarlarkRepositoryFunction.java
@@ -37,7 +37,7 @@
import com.google.devtools.build.lib.rules.repository.WorkspaceFileHelper;
import com.google.devtools.build.lib.runtime.ProcessWrapper;
import com.google.devtools.build.lib.runtime.RepositoryRemoteExecutor;
-import com.google.devtools.build.lib.skyframe.BlacklistedPackagePrefixesValue;
+import com.google.devtools.build.lib.skyframe.IgnoredPackagePrefixesValue;
import com.google.devtools.build.lib.skyframe.PrecomputedValue;
import com.google.devtools.build.lib.syntax.EvalException;
import com.google.devtools.build.lib.syntax.Mutability;
@@ -137,13 +137,13 @@
return null;
}
- BlacklistedPackagePrefixesValue blacklistedPackagesValue =
- (BlacklistedPackagePrefixesValue) env.getValue(BlacklistedPackagePrefixesValue.key());
+ IgnoredPackagePrefixesValue ignoredPackagesValue =
+ (IgnoredPackagePrefixesValue) env.getValue(IgnoredPackagePrefixesValue.key());
if (env.valuesMissing()) {
return null;
}
- ImmutableSet<PathFragment> blacklistedPatterns =
- Preconditions.checkNotNull(blacklistedPackagesValue).getPatterns();
+ ImmutableSet<PathFragment> ignoredPatterns =
+ Preconditions.checkNotNull(ignoredPackagesValue).getPatterns();
try (Mutability mu = Mutability.create("Starlark repository")) {
StarlarkThread thread = new StarlarkThread(mu, starlarkSemantics);
@@ -165,7 +165,7 @@
rule,
packageLocator,
outputDirectory,
- blacklistedPatterns,
+ ignoredPatterns,
env,
clientEnvironment,
downloadManager,
diff --git a/src/main/java/com/google/devtools/build/lib/cmdline/TargetPattern.java b/src/main/java/com/google/devtools/build/lib/cmdline/TargetPattern.java
index 15054a9..178286f 100644
--- a/src/main/java/com/google/devtools/build/lib/cmdline/TargetPattern.java
+++ b/src/main/java/com/google/devtools/build/lib/cmdline/TargetPattern.java
@@ -147,37 +147,37 @@
}
/**
- * Evaluates the current target pattern, excluding targets under directories in both
- * {@code blacklistedSubdirectories} and {@code excludedSubdirectories}, and returns the result.
+ * Evaluates the current target pattern, excluding targets under directories in both {@code
+ * ignoredSubdirectories} and {@code excludedSubdirectories}, and returns the result.
*
- * @throws IllegalArgumentException if either {@code blacklistedSubdirectories} or
- * {@code excludedSubdirectories} is nonempty and this pattern does not have type
- * {@code Type.TARGETS_BELOW_DIRECTORY}.
+ * @throws IllegalArgumentException if either {@code ignoredSubdirectories} or {@code
+ * excludedSubdirectories} is nonempty and this pattern does not have type {@code
+ * Type.TARGETS_BELOW_DIRECTORY}.
*/
public abstract <T, E extends Exception> void eval(
TargetPatternResolver<T> resolver,
- ImmutableSet<PathFragment> blacklistedSubdirectories,
+ ImmutableSet<PathFragment> ignoredSubdirectories,
ImmutableSet<PathFragment> excludedSubdirectories,
BatchCallback<T, E> callback,
Class<E> exceptionClass)
throws TargetParsingException, E, InterruptedException;
/**
- * Evaluates this {@link TargetPattern} synchronously, feeding the result to the given
- * {@code callback}, and then returns an appropriate immediate {@link ListenableFuture}.
+ * Evaluates this {@link TargetPattern} synchronously, feeding the result to the given {@code
+ * callback}, and then returns an appropriate immediate {@link ListenableFuture}.
*
- * <p>If the returned {@link ListenableFuture}'s {@link ListenableFuture#get} throws an
- * {@link ExecutionException}, the cause will be an instance of either
- * {@link TargetParsingException} or the given {@code exceptionClass}.
+ * <p>If the returned {@link ListenableFuture}'s {@link ListenableFuture#get} throws an {@link
+ * ExecutionException}, the cause will be an instance of either {@link TargetParsingException} or
+ * the given {@code exceptionClass}.
*/
public final <T, E extends Exception> ListenableFuture<Void> evalAdaptedForAsync(
TargetPatternResolver<T> resolver,
- ImmutableSet<PathFragment> blacklistedSubdirectories,
+ ImmutableSet<PathFragment> ignoredSubdirectories,
ImmutableSet<PathFragment> excludedSubdirectories,
ThreadSafeBatchCallback<T, E> callback,
Class<E> exceptionClass) {
try {
- eval(resolver, blacklistedSubdirectories, excludedSubdirectories, callback, exceptionClass);
+ eval(resolver, ignoredSubdirectories, excludedSubdirectories, callback, exceptionClass);
return Futures.immediateFuture(null);
} catch (TargetParsingException e) {
return Futures.immediateFailedFuture(e);
@@ -192,22 +192,22 @@
}
/**
- * Returns a {@link ListenableFuture} representing the asynchronous evaluation of this
- * {@link TargetPattern} that feeds the results to the given {@code callback}.
+ * Returns a {@link ListenableFuture} representing the asynchronous evaluation of this {@link
+ * TargetPattern} that feeds the results to the given {@code callback}.
*
- * <p>If the returned {@link ListenableFuture}'s {@link ListenableFuture#get} throws an
- * {@link ExecutionException}, the cause will be an instance of either
- * {@link TargetParsingException} or the given {@code exceptionClass}.
+ * <p>If the returned {@link ListenableFuture}'s {@link ListenableFuture#get} throws an {@link
+ * ExecutionException}, the cause will be an instance of either {@link TargetParsingException} or
+ * the given {@code exceptionClass}.
*/
public <T, E extends Exception> ListenableFuture<Void> evalAsync(
TargetPatternResolver<T> resolver,
- ImmutableSet<PathFragment> blacklistedSubdirectories,
+ ImmutableSet<PathFragment> ignoredSubdirectories,
ImmutableSet<PathFragment> excludedSubdirectories,
ThreadSafeBatchCallback<T, E> callback,
Class<E> exceptionClass,
ListeningExecutorService executor) {
return evalAdaptedForAsync(
- resolver, blacklistedSubdirectories, excludedSubdirectories, callback, exceptionClass);
+ resolver, ignoredSubdirectories, excludedSubdirectories, callback, exceptionClass);
}
/**
@@ -325,10 +325,11 @@
@Override
public <T, E extends Exception> void eval(
TargetPatternResolver<T> resolver,
- ImmutableSet<PathFragment> blacklistedSubdirectories,
+ ImmutableSet<PathFragment> ignoredSubdirectories,
ImmutableSet<PathFragment> excludedSubdirectories,
BatchCallback<T, E> callback,
- Class<E> exceptionClass) throws TargetParsingException, E, InterruptedException {
+ Class<E> exceptionClass)
+ throws TargetParsingException, E, InterruptedException {
callback.process(resolver.getExplicitTarget(label(targetName)).getTargets());
}
@@ -387,9 +388,10 @@
@Override
public <T, E extends Exception> void eval(
TargetPatternResolver<T> resolver,
- ImmutableSet<PathFragment> blacklistedSubdirectories,
+ ImmutableSet<PathFragment> ignoredSubdirectories,
ImmutableSet<PathFragment> excludedSubdirectories,
- BatchCallback<T, E> callback, Class<E> exceptionClass)
+ BatchCallback<T, E> callback,
+ Class<E> exceptionClass)
throws TargetParsingException, E, InterruptedException {
if (resolver.isPackage(PackageIdentifier.createInMainRepo(path))) {
// User has specified a package name. lookout for default target.
@@ -479,9 +481,10 @@
@Override
public <T, E extends Exception> void eval(
TargetPatternResolver<T> resolver,
- ImmutableSet<PathFragment> blacklistedSubdirectories,
+ ImmutableSet<PathFragment> ignoredSubdirectories,
ImmutableSet<PathFragment> excludedSubdirectories,
- BatchCallback<T, E> callback, Class<E> exceptionClass)
+ BatchCallback<T, E> callback,
+ Class<E> exceptionClass)
throws TargetParsingException, E, InterruptedException {
if (checkWildcardConflict) {
ResolvedTargets<T> targets = getWildcardConflict(resolver);
@@ -591,7 +594,7 @@
@Override
public <T, E extends Exception> void eval(
TargetPatternResolver<T> resolver,
- ImmutableSet<PathFragment> blacklistedSubdirectories,
+ ImmutableSet<PathFragment> ignoredSubdirectories,
ImmutableSet<PathFragment> excludedSubdirectories,
BatchCallback<T, E> callback,
Class<E> exceptionClass)
@@ -601,7 +604,7 @@
getOriginalPattern(),
directory.getPackageFragment().getPathString(),
rulesOnly,
- blacklistedSubdirectories,
+ ignoredSubdirectories,
excludedSubdirectories,
callback,
exceptionClass);
@@ -610,7 +613,7 @@
@Override
public <T, E extends Exception> ListenableFuture<Void> evalAsync(
TargetPatternResolver<T> resolver,
- ImmutableSet<PathFragment> blacklistedSubdirectories,
+ ImmutableSet<PathFragment> ignoredSubdirectories,
ImmutableSet<PathFragment> excludedSubdirectories,
ThreadSafeBatchCallback<T, E> callback,
Class<E> exceptionClass,
@@ -620,7 +623,7 @@
getOriginalPattern(),
directory.getPackageFragment().getPathString(),
rulesOnly,
- blacklistedSubdirectories,
+ ignoredSubdirectories,
excludedSubdirectories,
callback,
exceptionClass,
diff --git a/src/main/java/com/google/devtools/build/lib/packages/GlobCache.java b/src/main/java/com/google/devtools/build/lib/packages/GlobCache.java
index a90252c..613220e 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/GlobCache.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/GlobCache.java
@@ -98,7 +98,7 @@
public GlobCache(
final Path packageDirectory,
final PackageIdentifier packageId,
- final ImmutableSet<PathFragment> blacklistedGlobPrefixes,
+ final ImmutableSet<PathFragment> ignoredGlobPrefixes,
final CachingPackageLocator locator,
AtomicReference<? extends UnixGlob.FilesystemCalls> syscalls,
Executor globExecutor,
@@ -119,8 +119,8 @@
PathFragment subPackagePath =
packageId.getPackageFragment().getRelative(directory.relativeTo(packageDirectory));
- for (PathFragment blacklistedPrefix : blacklistedGlobPrefixes) {
- if (subPackagePath.startsWith(blacklistedPrefix)) {
+ for (PathFragment ignoredPrefix : ignoredGlobPrefixes) {
+ if (subPackagePath.startsWith(ignoredPrefix)) {
return false;
}
}
diff --git a/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java b/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java
index 2ecb069..6d4df0f 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java
@@ -556,13 +556,13 @@
public LegacyGlobber createLegacyGlobber(
Path packageDirectory,
PackageIdentifier packageId,
- ImmutableSet<PathFragment> blacklistedGlobPrefixes,
+ ImmutableSet<PathFragment> ignoredGlobPrefixes,
CachingPackageLocator locator) {
return createLegacyGlobber(
new GlobCache(
packageDirectory,
packageId,
- blacklistedGlobPrefixes,
+ ignoredGlobPrefixes,
locator,
syscalls,
executor,
diff --git a/src/main/java/com/google/devtools/build/lib/query2/BUILD b/src/main/java/com/google/devtools/build/lib/query2/BUILD
index 287d410..75d43fe 100644
--- a/src/main/java/com/google/devtools/build/lib/query2/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/query2/BUILD
@@ -68,11 +68,11 @@
"//src/main/java/com/google/devtools/build/lib/skyframe:actiongraph/v2/monolithic_output_handler",
"//src/main/java/com/google/devtools/build/lib/skyframe:actiongraph/v2/streamed_output_handler",
"//src/main/java/com/google/devtools/build/lib/skyframe:aspect_value_key",
- "//src/main/java/com/google/devtools/build/lib/skyframe:blacklisted_package_prefixes_value",
"//src/main/java/com/google/devtools/build/lib/skyframe:build_configuration_value",
"//src/main/java/com/google/devtools/build/lib/skyframe:configured_target_key",
"//src/main/java/com/google/devtools/build/lib/skyframe:containing_package_lookup_function",
"//src/main/java/com/google/devtools/build/lib/skyframe:graph_backed_recursive_package_provider",
+ "//src/main/java/com/google/devtools/build/lib/skyframe:ignored_package_prefixes_value",
"//src/main/java/com/google/devtools/build/lib/skyframe:package_lookup_value",
"//src/main/java/com/google/devtools/build/lib/skyframe:package_value",
"//src/main/java/com/google/devtools/build/lib/skyframe:prepare_deps_of_patterns_function",
diff --git a/src/main/java/com/google/devtools/build/lib/query2/PostAnalysisQueryEnvironment.java b/src/main/java/com/google/devtools/build/lib/query2/PostAnalysisQueryEnvironment.java
index 1a3749e..0be1399 100644
--- a/src/main/java/com/google/devtools/build/lib/query2/PostAnalysisQueryEnvironment.java
+++ b/src/main/java/com/google/devtools/build/lib/query2/PostAnalysisQueryEnvironment.java
@@ -53,10 +53,10 @@
import com.google.devtools.build.lib.query2.engine.ThreadSafeOutputFormatterCallback;
import com.google.devtools.build.lib.query2.engine.Uniquifier;
import com.google.devtools.build.lib.rules.AliasConfiguredTarget;
-import com.google.devtools.build.lib.skyframe.BlacklistedPackagePrefixesValue;
import com.google.devtools.build.lib.skyframe.ConfiguredTargetKey;
import com.google.devtools.build.lib.skyframe.ConfiguredTargetValue;
import com.google.devtools.build.lib.skyframe.GraphBackedRecursivePackageProvider;
+import com.google.devtools.build.lib.skyframe.IgnoredPackagePrefixesValue;
import com.google.devtools.build.lib.skyframe.PackageValue;
import com.google.devtools.build.lib.skyframe.RecursivePackageProviderBackedTargetPatternResolver;
import com.google.devtools.build.lib.skyframe.RecursivePkgValueRootPackageExtractor;
@@ -215,10 +215,10 @@
return (ConfiguredTargetValue) walkableGraphSupplier.get().getValue(key);
}
- public ImmutableSet<PathFragment> getBlacklistedPackagePrefixesPathFragments()
+ public ImmutableSet<PathFragment> getIgnoredPackagePrefixesPathFragments()
throws InterruptedException {
- return ((BlacklistedPackagePrefixesValue)
- walkableGraphSupplier.get().getValue(BlacklistedPackagePrefixesValue.key()))
+ return ((IgnoredPackagePrefixesValue)
+ walkableGraphSupplier.get().getValue(IgnoredPackagePrefixesValue.key()))
.getPatterns();
}
diff --git a/src/main/java/com/google/devtools/build/lib/query2/SkyQueryEnvironment.java b/src/main/java/com/google/devtools/build/lib/query2/SkyQueryEnvironment.java
index c2acfdf4..d06d317 100644
--- a/src/main/java/com/google/devtools/build/lib/query2/SkyQueryEnvironment.java
+++ b/src/main/java/com/google/devtools/build/lib/query2/SkyQueryEnvironment.java
@@ -85,8 +85,8 @@
import com.google.devtools.build.lib.query2.engine.ThreadSafeOutputFormatterCallback;
import com.google.devtools.build.lib.query2.engine.Uniquifier;
import com.google.devtools.build.lib.query2.query.BlazeTargetAccessor;
-import com.google.devtools.build.lib.skyframe.BlacklistedPackagePrefixesValue;
import com.google.devtools.build.lib.skyframe.GraphBackedRecursivePackageProvider;
+import com.google.devtools.build.lib.skyframe.IgnoredPackagePrefixesValue;
import com.google.devtools.build.lib.skyframe.PackageValue;
import com.google.devtools.build.lib.skyframe.PrepareDepsOfPatternsFunction;
import com.google.devtools.build.lib.skyframe.RecursivePackageProviderBackedTargetPatternResolver;
@@ -154,7 +154,7 @@
// The following fields are set in the #beforeEvaluateQuery method.
private MultisetSemaphore<PackageIdentifier> packageSemaphore;
protected WalkableGraph graph;
- protected InterruptibleSupplier<ImmutableSet<PathFragment>> blacklistPatternsSupplier;
+ protected InterruptibleSupplier<ImmutableSet<PathFragment>> ignoredPatternsSupplier;
protected GraphBackedRecursivePackageProvider graphBackedRecursivePackageProvider;
protected ListeningExecutorService executor;
private RecursivePackageProviderBackedTargetPatternResolver resolver;
@@ -258,7 +258,8 @@
checkEvaluationResult(roots, result);
packageSemaphore = makeFreshPackageMultisetSemaphore();
graph = result.getWalkableGraph();
- blacklistPatternsSupplier = MemoizingInterruptibleSupplier.of(new BlacklistSupplier(graph));
+ ignoredPatternsSupplier =
+ MemoizingInterruptibleSupplier.of(new IgnoredPatternSupplier(graph));
graphBackedRecursivePackageProvider =
new GraphBackedRecursivePackageProvider(
graph,
@@ -770,9 +771,9 @@
return new UniquifierImpl<>(SkyKeyKeyExtractor.INSTANCE, queryEvaluationParallelismLevel);
}
- private ImmutableSet<PathFragment> getBlacklistedExcludes(TargetPatternKey targetPatternKey)
- throws InterruptedException {
- return targetPatternKey.getAllBlacklistedSubdirectoriesToExclude(blacklistPatternsSupplier);
+ private ImmutableSet<PathFragment> getIgnoredSubdirectories(TargetPatternKey targetPatternKey)
+ throws InterruptedException {
+ return targetPatternKey.getAllIgnoredSubdirectoriesToExclude(ignoredPatternsSupplier);
}
@ThreadSafe
@@ -802,9 +803,9 @@
@ThreadSafe
public QueryTaskFuture<Void> evalTargetPatternKey(
QueryExpression owner, TargetPatternKey targetPatternKey, Callback<Target> callback) {
- ImmutableSet<PathFragment> blacklistedSubdirectoriesToExclude;
+ ImmutableSet<PathFragment> ignoredSubdirectoriesToExclude;
try {
- blacklistedSubdirectoriesToExclude = getBlacklistedExcludes(targetPatternKey);
+ ignoredSubdirectoriesToExclude = getIgnoredSubdirectories(targetPatternKey);
} catch (InterruptedException ie) {
return immediateCancelledFuture();
}
@@ -829,7 +830,7 @@
ListenableFuture<Void> evalFuture =
patternToEval.evalAsync(
resolver,
- blacklistedSubdirectoriesToExclude,
+ ignoredSubdirectoriesToExclude,
additionalSubdirectoriesToExclude,
filteredCallback,
QueryException.class,
@@ -1241,18 +1242,17 @@
.build();
}
- private static class BlacklistSupplier
+ private static class IgnoredPatternSupplier
implements InterruptibleSupplier<ImmutableSet<PathFragment>> {
private final WalkableGraph graph;
- private BlacklistSupplier(WalkableGraph graph) {
+ private IgnoredPatternSupplier(WalkableGraph graph) {
this.graph = graph;
}
@Override
public ImmutableSet<PathFragment> get() throws InterruptedException {
- return ((BlacklistedPackagePrefixesValue)
- graph.getValue(BlacklistedPackagePrefixesValue.key()))
+ return ((IgnoredPackagePrefixesValue) graph.getValue(IgnoredPackagePrefixesValue.key()))
.getPatterns();
}
}
diff --git a/src/main/java/com/google/devtools/build/lib/query2/aquery/ActionGraphQueryEnvironment.java b/src/main/java/com/google/devtools/build/lib/query2/aquery/ActionGraphQueryEnvironment.java
index e2677e5..4e2b685 100644
--- a/src/main/java/com/google/devtools/build/lib/query2/aquery/ActionGraphQueryEnvironment.java
+++ b/src/main/java/com/google/devtools/build/lib/query2/aquery/ActionGraphQueryEnvironment.java
@@ -330,7 +330,7 @@
Futures.catchingAsync(
patternToEval.evalAdaptedForAsync(
resolver,
- getBlacklistedPackagePrefixesPathFragments(),
+ getIgnoredPackagePrefixesPathFragments(),
/* excludedSubdirectories= */ ImmutableSet.of(),
(Callback<Target>)
partialResult -> {
diff --git a/src/main/java/com/google/devtools/build/lib/query2/cquery/ConfiguredTargetQueryEnvironment.java b/src/main/java/com/google/devtools/build/lib/query2/cquery/ConfiguredTargetQueryEnvironment.java
index da181ea..d10ab5f 100644
--- a/src/main/java/com/google/devtools/build/lib/query2/cquery/ConfiguredTargetQueryEnvironment.java
+++ b/src/main/java/com/google/devtools/build/lib/query2/cquery/ConfiguredTargetQueryEnvironment.java
@@ -285,7 +285,7 @@
Futures.catchingAsync(
patternToEval.evalAdaptedForAsync(
resolver,
- getBlacklistedPackagePrefixesPathFragments(),
+ getIgnoredPackagePrefixesPathFragments(),
/* excludedSubdirectories= */ ImmutableSet.of(),
(Callback<Target>)
partialResult -> {
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/BUILD b/src/main/java/com/google/devtools/build/lib/skyframe/BUILD
index 5c63a8a..3055988f 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/BUILD
@@ -122,8 +122,6 @@
":aspect_creation_exception",
":aspect_value_key",
":ast_file_lookup_value",
- ":blacklisted_package_prefixes_function",
- ":blacklisted_package_prefixes_value",
":build_configuration_value",
":build_info_collection_value",
":bzl_load_value",
@@ -159,6 +157,8 @@
":glob_descriptor",
":glob_function",
":glob_value",
+ ":ignored_package_prefixes_function",
+ ":ignored_package_prefixes_value",
":loading_phase_started_event",
":local_repository_lookup_value",
":managed_directories_knowledge",
@@ -849,10 +849,10 @@
)
java_library(
- name = "blacklisted_package_prefixes_function",
- srcs = ["BlacklistedPackagePrefixesFunction.java"],
+ name = "ignored_package_prefixes_function",
+ srcs = ["IgnoredPackagePrefixesFunction.java"],
deps = [
- ":blacklisted_package_prefixes_value",
+ ":ignored_package_prefixes_value",
":precomputed_value",
"//src/main/java/com/google/devtools/build/lib/actions",
"//src/main/java/com/google/devtools/build/lib/cmdline",
@@ -868,8 +868,8 @@
)
java_library(
- name = "blacklisted_package_prefixes_value",
- srcs = ["BlacklistedPackagePrefixesValue.java"],
+ name = "ignored_package_prefixes_value",
+ srcs = ["IgnoredPackagePrefixesValue.java"],
deps = [
":sky_functions",
"//src/main/java/com/google/devtools/build/lib/cmdline",
@@ -1469,10 +1469,10 @@
name = "glob_function",
srcs = ["GlobFunction.java"],
deps = [
- ":blacklisted_package_prefixes_value",
":directory_listing_value",
":glob_descriptor",
":glob_value",
+ ":ignored_package_prefixes_value",
":package_lookup_value",
"//src/main/java/com/google/devtools/build/lib/actions",
"//src/main/java/com/google/devtools/build/lib/cmdline",
@@ -1693,8 +1693,8 @@
name = "package_lookup_function",
srcs = ["PackageLookupFunction.java"],
deps = [
- ":blacklisted_package_prefixes_value",
":file_symlink_exception",
+ ":ignored_package_prefixes_value",
":local_repository_lookup_value",
":package_lookup_value",
":precomputed_value",
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/BazelSkyframeExecutorConstants.java b/src/main/java/com/google/devtools/build/lib/skyframe/BazelSkyframeExecutorConstants.java
index 1b0072c..a03e39d 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/BazelSkyframeExecutorConstants.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/BazelSkyframeExecutorConstants.java
@@ -27,7 +27,7 @@
private BazelSkyframeExecutorConstants() {
}
- public static final ImmutableSet<PathFragment> HARDCODED_BLACKLISTED_PACKAGE_PREFIXES =
+ public static final ImmutableSet<PathFragment> HARDCODED_IGNORED_PACKAGE_PREFIXES =
ImmutableSet.of();
/**
@@ -40,8 +40,8 @@
* after pattern expansion. So if a pattern expansion fails (e.g., due to symlink-cycles) and
* therefore fails the build, this ignore functionality currently has no chance to kick in.
*/
- public static final SkyFunction BLACKLISTED_PACKAGE_PREFIXES_FUNCTION =
- new BlacklistedPackagePrefixesFunction(PathFragment.create(".bazelignore"));
+ public static final SkyFunction IGNORED_PACKAGE_PREFIXES_FUNCTION =
+ new IgnoredPackagePrefixesFunction(PathFragment.create(".bazelignore"));
public static final CrossRepositoryLabelViolationStrategy
CROSS_REPOSITORY_LABEL_VIOLATION_STRATEGY = CrossRepositoryLabelViolationStrategy.ERROR;
@@ -61,7 +61,7 @@
public static SequencedSkyframeExecutor.Builder newBazelSkyframeExecutorBuilder() {
return SequencedSkyframeExecutor.builder()
- .setBlacklistedPackagePrefixesFunction(BLACKLISTED_PACKAGE_PREFIXES_FUNCTION)
+ .setIgnoredPackagePrefixesFunction(IGNORED_PACKAGE_PREFIXES_FUNCTION)
.setActionOnIOExceptionReadingBuildFile(ACTION_ON_IO_EXCEPTION_READING_BUILD_FILE)
.setCrossRepositoryLabelViolationStrategy(CROSS_REPOSITORY_LABEL_VIOLATION_STRATEGY)
.setBuildFilesByPriority(BUILD_FILES_BY_PRIORITY)
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/EnvironmentBackedRecursivePackageProvider.java b/src/main/java/com/google/devtools/build/lib/skyframe/EnvironmentBackedRecursivePackageProvider.java
index 5b474ed..6d204af 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/EnvironmentBackedRecursivePackageProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/EnvironmentBackedRecursivePackageProvider.java
@@ -146,7 +146,7 @@
ExtendedEventHandler eventHandler,
RepositoryName repository,
PathFragment directory,
- ImmutableSet<PathFragment> blacklistedSubdirectories,
+ ImmutableSet<PathFragment> ignoredSubdirectories,
ImmutableSet<PathFragment> excludedSubdirectories)
throws MissingDepException, InterruptedException {
PathPackageLocator packageLocator = PrecomputedValue.PATH_PACKAGE_LOCATOR.get(env);
@@ -171,13 +171,13 @@
roots.add(Root.fromPath(repositoryValue.getPath()));
}
- if (blacklistedSubdirectories.contains(directory)) {
+ if (ignoredSubdirectories.contains(directory)) {
return;
}
- ImmutableSet<PathFragment> filteredBlacklistedSubdirectories =
+ ImmutableSet<PathFragment> filteredIgnoredSubdirectories =
ImmutableSet.copyOf(
Iterables.filter(
- blacklistedSubdirectories,
+ ignoredSubdirectories,
path -> !path.equals(directory) && path.startsWith(directory)));
for (Root root : roots) {
@@ -187,7 +187,7 @@
RecursivePkgValue.key(
repository,
RootedPath.toRootedPath(root, directory),
- filteredBlacklistedSubdirectories));
+ filteredIgnoredSubdirectories));
if (lookup == null) {
// Typically a null value from Environment.getValue(k) means that either the key k is
// missing a dependency or an exception was thrown during evaluation of k. Here, if this
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/GlobFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/GlobFunction.java
index 24a1813..b832485 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/GlobFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/GlobFunction.java
@@ -58,9 +58,8 @@
GlobDescriptor glob = (GlobDescriptor) skyKey.argument();
RepositoryName repositoryName = glob.getPackageId().getRepository();
- BlacklistedPackagePrefixesValue blacklistedPackagePrefixes =
- (BlacklistedPackagePrefixesValue)
- env.getValue(BlacklistedPackagePrefixesValue.key(repositoryName));
+ IgnoredPackagePrefixesValue ignoredPackagePrefixes =
+ (IgnoredPackagePrefixesValue) env.getValue(IgnoredPackagePrefixesValue.key(repositoryName));
if (env.valuesMissing()) {
return null;
}
@@ -68,8 +67,8 @@
PathFragment globSubdir = glob.getSubdir();
PathFragment dirPathFragment = glob.getPackageId().getPackageFragment().getRelative(globSubdir);
- for (PathFragment blacklistedPrefix : blacklistedPackagePrefixes.getPatterns()) {
- if (dirPathFragment.startsWith(blacklistedPrefix)) {
+ for (PathFragment ignoredPrefix : ignoredPackagePrefixes.getPatterns()) {
+ if (dirPathFragment.startsWith(ignoredPrefix)) {
return GlobValue.EMPTY;
}
}
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/GraphBackedRecursivePackageProvider.java b/src/main/java/com/google/devtools/build/lib/skyframe/GraphBackedRecursivePackageProvider.java
index 1d0713c..a405221 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/GraphBackedRecursivePackageProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/GraphBackedRecursivePackageProvider.java
@@ -161,11 +161,10 @@
private List<Root> checkValidDirectoryAndGetRoots(
RepositoryName repository,
PathFragment directory,
- ImmutableSet<PathFragment> blacklistedSubdirectories,
+ ImmutableSet<PathFragment> ignoredSubdirectories,
ImmutableSet<PathFragment> excludedSubdirectories)
throws InterruptedException {
- if (blacklistedSubdirectories.contains(directory)
- || excludedSubdirectories.contains(directory)) {
+ if (ignoredSubdirectories.contains(directory) || excludedSubdirectories.contains(directory)) {
return ImmutableList.of();
}
@@ -206,12 +205,12 @@
ExtendedEventHandler eventHandler,
RepositoryName repository,
PathFragment directory,
- ImmutableSet<PathFragment> blacklistedSubdirectories,
+ ImmutableSet<PathFragment> ignoredSubdirectories,
ImmutableSet<PathFragment> excludedSubdirectories)
throws InterruptedException {
List<Root> roots =
checkValidDirectoryAndGetRoots(
- repository, directory, blacklistedSubdirectories, excludedSubdirectories);
+ repository, directory, ignoredSubdirectories, excludedSubdirectories);
rootPackageExtractor.streamPackagesFromRoots(
results,
@@ -220,7 +219,7 @@
eventHandler,
repository,
directory,
- blacklistedSubdirectories,
+ ignoredSubdirectories,
excludedSubdirectories);
}
}
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/BlacklistedPackagePrefixesFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/IgnoredPackagePrefixesFunction.java
similarity index 75%
rename from src/main/java/com/google/devtools/build/lib/skyframe/BlacklistedPackagePrefixesFunction.java
rename to src/main/java/com/google/devtools/build/lib/skyframe/IgnoredPackagePrefixesFunction.java
index 9734041..eb373eb 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/BlacklistedPackagePrefixesFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/IgnoredPackagePrefixesFunction.java
@@ -34,27 +34,27 @@
import javax.annotation.Nullable;
/**
- * A {@link SkyFunction} for {@link BlacklistedPackagePrefixesValue}.
+ * A {@link SkyFunction} for {@link IgnoredPackagePrefixesValue}.
*
* <p>It is used to implement the `.bazelignore` feature.
*/
-public class BlacklistedPackagePrefixesFunction implements SkyFunction {
- private final PathFragment blacklistedPackagePrefixesFile;
+public class IgnoredPackagePrefixesFunction implements SkyFunction {
+ private final PathFragment ignoredPackagePrefixesFile;
- public BlacklistedPackagePrefixesFunction(PathFragment blacklistedPackagePrefixesFile) {
- this.blacklistedPackagePrefixesFile = blacklistedPackagePrefixesFile;
+ public IgnoredPackagePrefixesFunction(PathFragment ignoredPackagePrefixesFile) {
+ this.ignoredPackagePrefixesFile = ignoredPackagePrefixesFile;
}
- public static void getBlacklistedPackagePrefixes(
- RootedPath patternFile, ImmutableSet.Builder<PathFragment> blacklistedPackagePrefixesBuilder)
- throws BlacklistedPatternsFunctionException {
+ public static void getIgnoredPackagePrefixes(
+ RootedPath patternFile, ImmutableSet.Builder<PathFragment> ignoredPackagePrefixesBuilder)
+ throws IgnoredPatternsFunctionException {
try (InputStreamReader reader =
new InputStreamReader(patternFile.asPath().getInputStream(), StandardCharsets.UTF_8)) {
- blacklistedPackagePrefixesBuilder.addAll(
+ ignoredPackagePrefixesBuilder.addAll(
CharStreams.readLines(reader, new PathFragmentLineProcessor()));
} catch (IOException e) {
String errorMessage = e.getMessage() != null ? "error '" + e.getMessage() + "'" : "an error";
- throw new BlacklistedPatternsFunctionException(
+ throw new IgnoredPatternsFunctionException(
new InconsistentFilesystemException(
patternFile.asPath()
+ " is not readable because: "
@@ -69,8 +69,8 @@
throws SkyFunctionException, InterruptedException {
RepositoryName repositoryName = (RepositoryName) key.argument();
- ImmutableSet.Builder<PathFragment> blacklistedPackagePrefixesBuilder = ImmutableSet.builder();
- if (!blacklistedPackagePrefixesFile.equals(PathFragment.EMPTY_FRAGMENT)) {
+ ImmutableSet.Builder<PathFragment> ignoredPackagePrefixesBuilder = ImmutableSet.builder();
+ if (!ignoredPackagePrefixesFile.equals(PathFragment.EMPTY_FRAGMENT)) {
PathPackageLocator pkgLocator = PrecomputedValue.PATH_PACKAGE_LOCATOR.get(env);
if (env.valuesMissing()) {
return null;
@@ -79,13 +79,13 @@
if (repositoryName.isMain()) {
for (Root packagePathEntry : pkgLocator.getPathEntries()) {
RootedPath rootedPatternFile =
- RootedPath.toRootedPath(packagePathEntry, blacklistedPackagePrefixesFile);
+ RootedPath.toRootedPath(packagePathEntry, ignoredPackagePrefixesFile);
FileValue patternFileValue = (FileValue) env.getValue(FileValue.key(rootedPatternFile));
if (patternFileValue == null) {
return null;
}
if (patternFileValue.isFile()) {
- getBlacklistedPackagePrefixes(rootedPatternFile, blacklistedPackagePrefixesBuilder);
+ getIgnoredPackagePrefixes(rootedPatternFile, ignoredPackagePrefixesBuilder);
break;
}
}
@@ -99,19 +99,19 @@
if (repositoryValue.repositoryExists()) {
RootedPath rootedPatternFile =
RootedPath.toRootedPath(
- Root.fromPath(repositoryValue.getPath()), blacklistedPackagePrefixesFile);
+ Root.fromPath(repositoryValue.getPath()), ignoredPackagePrefixesFile);
FileValue patternFileValue = (FileValue) env.getValue(FileValue.key(rootedPatternFile));
if (patternFileValue == null) {
return null;
}
if (patternFileValue.isFile()) {
- getBlacklistedPackagePrefixes(rootedPatternFile, blacklistedPackagePrefixesBuilder);
+ getIgnoredPackagePrefixes(rootedPatternFile, ignoredPackagePrefixesBuilder);
}
}
}
}
- return BlacklistedPackagePrefixesValue.of(blacklistedPackagePrefixesBuilder.build());
+ return IgnoredPackagePrefixesValue.of(ignoredPackagePrefixesBuilder.build());
}
private static final class PathFragmentLineProcessor
@@ -138,8 +138,8 @@
return null;
}
- private static final class BlacklistedPatternsFunctionException extends SkyFunctionException {
- public BlacklistedPatternsFunctionException(InconsistentFilesystemException e) {
+ private static final class IgnoredPatternsFunctionException extends SkyFunctionException {
+ public IgnoredPatternsFunctionException(InconsistentFilesystemException e) {
super(e, Transience.TRANSIENT);
}
}
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/BlacklistedPackagePrefixesValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/IgnoredPackagePrefixesValue.java
similarity index 77%
rename from src/main/java/com/google/devtools/build/lib/skyframe/BlacklistedPackagePrefixesValue.java
rename to src/main/java/com/google/devtools/build/lib/skyframe/IgnoredPackagePrefixesValue.java
index 0426f36..d595935 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/BlacklistedPackagePrefixesValue.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/IgnoredPackagePrefixesValue.java
@@ -25,22 +25,22 @@
import com.google.devtools.build.skyframe.SkyKey;
import com.google.devtools.build.skyframe.SkyValue;
-/** An immutable set of package name prefixes that should be blacklisted. */
+/** An immutable set of package name prefixes that should be ignored. */
@AutoCodec
-public class BlacklistedPackagePrefixesValue implements SkyValue {
+public class IgnoredPackagePrefixesValue implements SkyValue {
private final ImmutableSet<PathFragment> patterns;
@AutoCodec @AutoCodec.VisibleForSerialization
- public static final BlacklistedPackagePrefixesValue NO_BLACKLIST =
- new BlacklistedPackagePrefixesValue(ImmutableSet.of());
+ public static final IgnoredPackagePrefixesValue EMPTY_LIST =
+ new IgnoredPackagePrefixesValue(ImmutableSet.of());
- private BlacklistedPackagePrefixesValue(ImmutableSet<PathFragment> patterns) {
+ private IgnoredPackagePrefixesValue(ImmutableSet<PathFragment> patterns) {
this.patterns = Preconditions.checkNotNull(patterns);
}
@AutoCodec.Instantiator
- public static BlacklistedPackagePrefixesValue of(ImmutableSet<PathFragment> patterns) {
- return patterns.isEmpty() ? NO_BLACKLIST : new BlacklistedPackagePrefixesValue(patterns);
+ public static IgnoredPackagePrefixesValue of(ImmutableSet<PathFragment> patterns) {
+ return patterns.isEmpty() ? EMPTY_LIST : new IgnoredPackagePrefixesValue(patterns);
}
/** Creates a key from the main repository. */
@@ -64,8 +64,8 @@
@Override
public boolean equals(Object obj) {
- if (obj instanceof BlacklistedPackagePrefixesValue) {
- BlacklistedPackagePrefixesValue other = (BlacklistedPackagePrefixesValue) obj;
+ if (obj instanceof IgnoredPackagePrefixesValue) {
+ IgnoredPackagePrefixesValue other = (IgnoredPackagePrefixesValue) obj;
return this.patterns.equals(other.patterns);
}
return false;
@@ -88,7 +88,7 @@
@Override
public SkyFunctionName functionName() {
- return SkyFunctions.BLACKLISTED_PACKAGE_PREFIXES;
+ return SkyFunctions.IGNORED_PACKAGE_PREFIXES;
}
}
}
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/PackageFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/PackageFunction.java
index 88b90dc..322940f 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/PackageFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/PackageFunction.java
@@ -408,9 +408,9 @@
FileValue buildFileValue = getBuildFileValue(env, buildFileRootedPath);
RuleVisibility defaultVisibility = PrecomputedValue.DEFAULT_VISIBILITY.get(env);
StarlarkSemantics starlarkSemantics = PrecomputedValue.STARLARK_SEMANTICS.get(env);
- BlacklistedPackagePrefixesValue blacklistedPackagePrefixes =
- (BlacklistedPackagePrefixesValue)
- env.getValue(BlacklistedPackagePrefixesValue.key(packageId.getRepository()));
+ IgnoredPackagePrefixesValue repositoryIgnoredPackagePrefixes =
+ (IgnoredPackagePrefixesValue)
+ env.getValue(IgnoredPackagePrefixesValue.key(packageId.getRepository()));
if (env.valuesMissing()) {
return null;
}
@@ -460,7 +460,7 @@
loadPackage(
workspaceName,
repositoryMapping,
- blacklistedPackagePrefixes.getPatterns(),
+ repositoryIgnoredPackagePrefixes.getPatterns(),
packageId,
buildFileRootedPath,
buildFileValue,
@@ -1107,12 +1107,15 @@
private GlobberWithSkyframeGlobDeps makeGlobber(
Path buildFilePath,
PackageIdentifier packageId,
- ImmutableSet<PathFragment> blacklistedGlobPrefixes,
+ ImmutableSet<PathFragment> repositoryIgnoredPatterns,
Root packageRoot,
SkyFunction.Environment env) {
LegacyGlobber legacyGlobber =
packageFactory.createLegacyGlobber(
- buildFilePath.getParentDirectory(), packageId, blacklistedGlobPrefixes, packageLocator);
+ buildFilePath.getParentDirectory(),
+ packageId,
+ repositoryIgnoredPatterns,
+ packageLocator);
switch (incrementalityIntent) {
case INCREMENTAL:
return new SkyframeHybridGlobber(packageId, packageRoot, env, legacyGlobber);
@@ -1140,7 +1143,7 @@
private LoadedPackageCacheEntry loadPackage(
String workspaceName,
ImmutableMap<RepositoryName, RepositoryName> repositoryMapping,
- ImmutableSet<PathFragment> blacklistedGlobPrefixes,
+ ImmutableSet<PathFragment> repositoryIgnoredPatterns,
PackageIdentifier packageId,
RootedPath buildFilePath,
@Nullable FileValue buildFileValue,
@@ -1225,7 +1228,7 @@
// Therefore, it is safe to invalidate the astCache entry for this packageId here.
fileSyntaxCache.invalidate(packageId);
GlobberWithSkyframeGlobDeps globberWithSkyframeGlobDeps =
- makeGlobber(inputFile, packageId, blacklistedGlobPrefixes, packageRoot, env);
+ makeGlobber(inputFile, packageId, repositoryIgnoredPatterns, packageRoot, env);
long startTimeNanos = BlazeClock.nanoTime();
Package.Builder pkgBuilder =
packageFactory.createPackageFromAst(
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/PackageLookupFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/PackageLookupFunction.java
index 9a22cda..73a19af 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/PackageLookupFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/PackageLookupFunction.java
@@ -101,13 +101,13 @@
}
// Check .bazelignore file under main repository.
- BlacklistedPackagePrefixesValue blacklistedPatternsValue =
- (BlacklistedPackagePrefixesValue) env.getValue(BlacklistedPackagePrefixesValue.key());
- if (blacklistedPatternsValue == null) {
+ IgnoredPackagePrefixesValue ignoredPatternsValue =
+ (IgnoredPackagePrefixesValue) env.getValue(IgnoredPackagePrefixesValue.key());
+ if (ignoredPatternsValue == null) {
return null;
}
- if (isPackageIgnored(packageKey, blacklistedPatternsValue)) {
+ if (isPackageIgnored(packageKey, ignoredPatternsValue)) {
return PackageLookupValue.DELETED_PACKAGE_VALUE;
}
@@ -281,9 +281,9 @@
}
private static boolean isPackageIgnored(
- PackageIdentifier id, BlacklistedPackagePrefixesValue blacklistedPatternsValue) {
+ PackageIdentifier id, IgnoredPackagePrefixesValue ignoredPatternsValue) {
PathFragment packageFragment = id.getPackageFragment();
- for (PathFragment pattern : blacklistedPatternsValue.getPatterns()) {
+ for (PathFragment pattern : ignoredPatternsValue.getPatterns()) {
if (packageFragment.startsWith(pattern)) {
return true;
}
@@ -347,14 +347,14 @@
}
// Check .bazelignore file after fetching the external repository.
- BlacklistedPackagePrefixesValue blacklistedPatternsValue =
- (BlacklistedPackagePrefixesValue)
- env.getValue(BlacklistedPackagePrefixesValue.key(id.getRepository()));
- if (blacklistedPatternsValue == null) {
+ IgnoredPackagePrefixesValue ignoredPatternsValue =
+ (IgnoredPackagePrefixesValue)
+ env.getValue(IgnoredPackagePrefixesValue.key(id.getRepository()));
+ if (ignoredPatternsValue == null) {
return null;
}
- if (isPackageIgnored(id, blacklistedPatternsValue)) {
+ if (isPackageIgnored(id, ignoredPatternsValue)) {
return PackageLookupValue.DELETED_PACKAGE_VALUE;
}
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternFunction.java
index 95c69c5..40ecc05 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternFunction.java
@@ -83,21 +83,23 @@
TargetPattern parsedPattern = patternKey.getParsedPattern();
- BlacklistedPackagePrefixesValue blacklist =
- (BlacklistedPackagePrefixesValue)
- env.getValue(BlacklistedPackagePrefixesValue.key(parsedPattern.getRepository()));
- if (blacklist == null) {
+ IgnoredPackagePrefixesValue repositoryIgnoredPrefixes =
+ (IgnoredPackagePrefixesValue)
+ env.getValue(IgnoredPackagePrefixesValue.key(parsedPattern.getRepository()));
+ if (repositoryIgnoredPrefixes == null) {
return null;
}
- ImmutableSet<PathFragment> blacklistedPatterns = blacklist.getPatterns();
+ ImmutableSet<PathFragment> repositoryIgnoredPatterns = repositoryIgnoredPrefixes.getPatterns();
- // This SkyFunction is used to load the universe, so we want both the blacklisted directories
- // from the global blacklist and the excluded directories from the TargetPatternKey itself to be
- // embedded in the SkyKeys created and used by the DepsOfPatternPreparer. The
- // DepsOfPatternPreparer ignores excludedSubdirectories and embeds blacklistedSubdirectories in
- // the SkyKeys it creates and uses.
- ImmutableSet<PathFragment> blacklistedSubdirectories =
- patternKey.getAllSubdirectoriesToExclude(blacklistedPatterns);
+ // This SkyFunction is used to load the universe, so we want both the
+ // ignored directories from the global list of exclusions (set with
+ // .bazelignore in Bazel and set staticly in other binaries) and the
+ // excluded directories from the TargetPatternKey itself to be embedded in
+ // the SkyKeys created and used by the DepsOfPatternPreparer. The
+ // DepsOfPatternPreparer ignores excludedSubdirectories and embeds
+ // repositoryIgnoredSubdirectories in the SkyKeys it creates and uses.
+ ImmutableSet<PathFragment> repositoryIgnoredSubdirectories =
+ patternKey.getAllSubdirectoriesToExclude(repositoryIgnoredPatterns);
ImmutableSet<PathFragment> excludedSubdirectories = ImmutableSet.of();
DepsOfPatternPreparer preparer =
@@ -106,7 +108,7 @@
try {
parsedPattern.eval(
preparer,
- blacklistedSubdirectories,
+ repositoryIgnoredSubdirectories,
excludedSubdirectories,
NullCallback.<Void>instance(),
RuntimeException.class);
@@ -247,13 +249,13 @@
String originalPattern,
String directory,
boolean rulesOnly,
- ImmutableSet<PathFragment> blacklistedSubdirectories,
+ ImmutableSet<PathFragment> repositoryIgnoredSubdirectories,
ImmutableSet<PathFragment> excludedSubdirectories,
BatchCallback<Void, E> callback,
Class<E> exceptionClass)
throws TargetParsingException, E, InterruptedException {
PathFragment directoryPathFragment = TargetPatternResolverUtil.getPathFragment(directory);
- if (blacklistedSubdirectories.contains(directoryPathFragment)) {
+ if (repositoryIgnoredSubdirectories.contains(directoryPathFragment)) {
return;
}
Preconditions.checkArgument(excludedSubdirectories.isEmpty(), excludedSubdirectories);
@@ -279,7 +281,7 @@
for (Root root : roots) {
RootedPath rootedPath = RootedPath.toRootedPath(root, directoryPathFragment);
- env.getValues(getDeps(repository, blacklistedSubdirectories, policy, rootedPath));
+ env.getValues(getDeps(repository, repositoryIgnoredSubdirectories, policy, rootedPath));
if (env.valuesMissing()) {
throw new MissingDepException();
}
@@ -288,20 +290,20 @@
private ImmutableList<SkyKey> getDeps(
RepositoryName repository,
- ImmutableSet<PathFragment> blacklistedSubdirectories,
+ ImmutableSet<PathFragment> repositoryIgnoredSubdirectories,
FilteringPolicy policy,
RootedPath rootedPath) {
List<SkyKey> keys = new ArrayList<>();
keys.add(
PrepareDepsOfTargetsUnderDirectoryValue.key(
- repository, rootedPath, blacklistedSubdirectories, policy));
+ repository, rootedPath, repositoryIgnoredSubdirectories, policy));
keys.add(
CollectPackagesUnderDirectoryValue.key(
- repository, rootedPath, blacklistedSubdirectories));
+ repository, rootedPath, repositoryIgnoredSubdirectories));
if (traverseTestSuites) {
keys.add(
PrepareTestSuitesUnderDirectoryValue.key(
- repository, rootedPath, blacklistedSubdirectories));
+ repository, rootedPath, repositoryIgnoredSubdirectories));
}
return ImmutableList.copyOf(keys);
}
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/RecursivePkgValueRootPackageExtractor.java b/src/main/java/com/google/devtools/build/lib/skyframe/RecursivePkgValueRootPackageExtractor.java
index 39013ad..e541c0b 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/RecursivePkgValueRootPackageExtractor.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/RecursivePkgValueRootPackageExtractor.java
@@ -39,13 +39,13 @@
ExtendedEventHandler eventHandler,
RepositoryName repository,
PathFragment directory,
- ImmutableSet<PathFragment> blacklistedSubdirectories,
+ ImmutableSet<PathFragment> ignoredSubdirectories,
ImmutableSet<PathFragment> excludedSubdirectories)
throws InterruptedException {
- ImmutableSet<PathFragment> filteredBlacklistedSubdirectories =
+ ImmutableSet<PathFragment> filteredIgnoredSubdirectories =
ImmutableSet.copyOf(
Iterables.filter(
- blacklistedSubdirectories,
+ ignoredSubdirectories,
path -> !path.equals(directory) && path.startsWith(directory)));
for (Root root : roots) {
@@ -58,7 +58,7 @@
RecursivePkgValue.key(
repository,
RootedPath.toRootedPath(root, directory),
- filteredBlacklistedSubdirectories));
+ filteredIgnoredSubdirectories));
Preconditions.checkState(
lookup != null,
"Root %s in repository %s could not be found in the graph.",
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java
index 9a203cb..38c5f9e 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java
@@ -168,7 +168,7 @@
Iterable<? extends DiffAwareness.Factory> diffAwarenessFactories,
ImmutableMap<SkyFunctionName, SkyFunction> extraSkyFunctions,
Iterable<SkyValueDirtinessChecker> customDirtinessCheckers,
- SkyFunction blacklistedPackagePrefixesFunction,
+ SkyFunction ignoredPackagePrefixesFunction,
CrossRepositoryLabelViolationStrategy crossRepositoryLabelViolationStrategy,
ImmutableList<BuildFileName> buildFilesByPriority,
ExternalPackageHelper externalPackageHelper,
@@ -185,7 +185,7 @@
workspaceStatusActionFactory,
extraSkyFunctions,
ExternalFileAction.DEPEND_ON_EXTERNAL_PKG_FOR_EXTERNAL_REPO_PATHS,
- blacklistedPackagePrefixesFunction,
+ ignoredPackagePrefixesFunction,
crossRepositoryLabelViolationStrategy,
buildFilesByPriority,
externalPackageHelper,
@@ -1071,7 +1071,7 @@
private Iterable<? extends DiffAwareness.Factory> diffAwarenessFactories = ImmutableList.of();
private Iterable<SkyValueDirtinessChecker> customDirtinessCheckers = ImmutableList.of();
private Consumer<SkyframeExecutor> skyframeExecutorConsumerOnInit = skyframeExecutor -> {};
- private SkyFunction blacklistedPackagePrefixesFunction;
+ private SkyFunction ignoredPackagePrefixesFunction;
private Builder() {}
@@ -1086,7 +1086,7 @@
Preconditions.checkNotNull(buildFilesByPriority);
Preconditions.checkNotNull(externalPackageHelper);
Preconditions.checkNotNull(actionOnIOExceptionReadingBuildFile);
- Preconditions.checkNotNull(blacklistedPackagePrefixesFunction);
+ Preconditions.checkNotNull(ignoredPackagePrefixesFunction);
SequencedSkyframeExecutor skyframeExecutor =
new SequencedSkyframeExecutor(
@@ -1100,7 +1100,7 @@
diffAwarenessFactories,
extraSkyFunctions,
customDirtinessCheckers,
- blacklistedPackagePrefixesFunction,
+ ignoredPackagePrefixesFunction,
crossRepositoryLabelViolationStrategy,
buildFilesByPriority,
externalPackageHelper,
@@ -1136,9 +1136,8 @@
return this;
}
- public Builder setBlacklistedPackagePrefixesFunction(
- SkyFunction blacklistedPackagePrefixesFunction) {
- this.blacklistedPackagePrefixesFunction = blacklistedPackagePrefixesFunction;
+ public Builder setIgnoredPackagePrefixesFunction(SkyFunction ignoredPackagePrefixesFunction) {
+ this.ignoredPackagePrefixesFunction = ignoredPackagePrefixesFunction;
return this;
}
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyFunctions.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyFunctions.java
index 8804524..b47b5f1 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyFunctions.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyFunctions.java
@@ -73,8 +73,8 @@
SkyFunctionName.createHermetic("COLLECT_TEST_SUITES_IN_PACKAGE");
public static final SkyFunctionName COLLECT_PACKAGES_UNDER_DIRECTORY =
SkyFunctionName.createHermetic("COLLECT_PACKAGES_UNDER_DIRECTORY");
- public static final SkyFunctionName BLACKLISTED_PACKAGE_PREFIXES =
- SkyFunctionName.createHermetic("BLACKLISTED_PACKAGE_PREFIXES");
+ public static final SkyFunctionName IGNORED_PACKAGE_PREFIXES =
+ SkyFunctionName.createHermetic("IGNORED_PACKAGE_PREFIXES");
static final SkyFunctionName TEST_SUITE_EXPANSION =
SkyFunctionName.createHermetic("TEST_SUITE_EXPANSION");
static final SkyFunctionName TESTS_IN_SUITE = SkyFunctionName.createHermetic("TESTS_IN_SUITE");
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
index 01e7153..1e11385 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
@@ -322,7 +322,7 @@
protected SkyframeIncrementalBuildMonitor incrementalBuildMonitor =
new SkyframeIncrementalBuildMonitor();
- private final SkyFunction blacklistedPackagePrefixesFunction;
+ private final SkyFunction ignoredPackagePrefixesFunction;
private final ConfiguredRuleClassProvider ruleClassProvider;
@@ -386,7 +386,7 @@
Factory workspaceStatusActionFactory,
ImmutableMap<SkyFunctionName, SkyFunction> extraSkyFunctions,
ExternalFileAction externalFileAction,
- SkyFunction blacklistedPackagePrefixesFunction,
+ SkyFunction ignoredPackagePrefixesFunction,
CrossRepositoryLabelViolationStrategy crossRepositoryLabelViolationStrategy,
ImmutableList<BuildFileName> buildFilesByPriority,
ExternalPackageHelper externalPackageHelper,
@@ -420,7 +420,7 @@
this.fileSystem = fileSystem;
this.directories = Preconditions.checkNotNull(directories);
this.actionKeyContext = Preconditions.checkNotNull(actionKeyContext);
- this.blacklistedPackagePrefixesFunction = blacklistedPackagePrefixesFunction;
+ this.ignoredPackagePrefixesFunction = ignoredPackagePrefixesFunction;
this.extraSkyFunctions = extraSkyFunctions;
this.ruleClassProvider = (ConfiguredRuleClassProvider) pkgFactory.getRuleClassProvider();
@@ -504,7 +504,7 @@
map.put(
SkyFunctions.COLLECT_PACKAGES_UNDER_DIRECTORY,
newCollectPackagesUnderDirectoryFunction(directories));
- map.put(SkyFunctions.BLACKLISTED_PACKAGE_PREFIXES, blacklistedPackagePrefixesFunction);
+ map.put(SkyFunctions.IGNORED_PACKAGE_PREFIXES, ignoredPackagePrefixesFunction);
map.put(SkyFunctions.TESTS_IN_SUITE, new TestExpansionFunction());
map.put(SkyFunctions.TEST_SUITE_EXPANSION, new TestsForTargetPatternFunction());
map.put(
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeTargetPatternEvaluator.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeTargetPatternEvaluator.java
index a518624..17a42fb 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeTargetPatternEvaluator.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeTargetPatternEvaluator.java
@@ -236,7 +236,7 @@
AtomicReference<Collection<Target>> result = new AtomicReference<>();
targetPattern.eval(
resolver,
- /*blacklistedSubdirectories=*/ ImmutableSet.<PathFragment>of(),
+ /*ignoredSubdirectories=*/ ImmutableSet.<PathFragment>of(),
/*excludedSubdirectories=*/ ImmutableSet.<PathFragment>of(),
partialResult ->
result.set(
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternFunction.java
index fd31d2e..ed12530 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternFunction.java
@@ -48,13 +48,13 @@
((TargetPatternValue.TargetPatternKey) key.argument());
TargetPattern parsedPattern = patternKey.getParsedPattern();
- BlacklistedPackagePrefixesValue blacklist =
- (BlacklistedPackagePrefixesValue)
- env.getValue(BlacklistedPackagePrefixesValue.key(parsedPattern.getRepository()));
- if (blacklist == null) {
+ IgnoredPackagePrefixesValue ignoredPackagePrefixes =
+ (IgnoredPackagePrefixesValue)
+ env.getValue(IgnoredPackagePrefixesValue.key(parsedPattern.getRepository()));
+ if (ignoredPackagePrefixes == null) {
return null;
}
- ImmutableSet<PathFragment> blacklistedPatterns = blacklist.getPatterns();
+ ImmutableSet<PathFragment> ignoredPatterns = ignoredPackagePrefixes.getPatterns();
ResolvedTargets<Target> resolvedTargets;
try {
@@ -79,7 +79,7 @@
};
parsedPattern.eval(
resolver,
- blacklistedPatterns,
+ ignoredPatterns,
excludedSubdirectories,
callback,
// The exception type here has to match the one on the BatchCallback. Since the callback
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternValue.java
index 48efdc2..58ee493 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternValue.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternValue.java
@@ -330,38 +330,37 @@
}
ImmutableSet<PathFragment> getAllSubdirectoriesToExclude(
- Iterable<PathFragment> blacklistedPackagePrefixes) throws InterruptedException {
+ Iterable<PathFragment> ignoredPackagePrefixes) throws InterruptedException {
ImmutableSet.Builder<PathFragment> excludedPathsBuilder = ImmutableSet.builder();
excludedPathsBuilder.addAll(getExcludedSubdirectories());
excludedPathsBuilder.addAll(
- getAllBlacklistedSubdirectoriesToExclude(() -> blacklistedPackagePrefixes));
+ getAllIgnoredSubdirectoriesToExclude(() -> ignoredPackagePrefixes));
return excludedPathsBuilder.build();
}
- public ImmutableSet<PathFragment> getAllBlacklistedSubdirectoriesToExclude(
- InterruptibleSupplier<? extends Iterable<PathFragment>> blacklistedPackagePrefixes)
+ public ImmutableSet<PathFragment> getAllIgnoredSubdirectoriesToExclude(
+ InterruptibleSupplier<? extends Iterable<PathFragment>> ignoredPackagePrefixes)
throws InterruptedException {
- return getAllBlacklistedSubdirectoriesToExclude(parsedPattern, blacklistedPackagePrefixes);
+ return getAllIgnoredSubdirectoriesToExclude(parsedPattern, ignoredPackagePrefixes);
}
- public static ImmutableSet<PathFragment> getAllBlacklistedSubdirectoriesToExclude(
+ public static ImmutableSet<PathFragment> getAllIgnoredSubdirectoriesToExclude(
TargetPattern pattern,
- InterruptibleSupplier<? extends Iterable<PathFragment>> blacklistedPackagePrefixes)
+ InterruptibleSupplier<? extends Iterable<PathFragment>> ignoredPackagePrefixes)
throws InterruptedException {
- ImmutableSet.Builder<PathFragment> blacklistedPathsBuilder = ImmutableSet.builder();
+ ImmutableSet.Builder<PathFragment> ignoredPathsBuilder = ImmutableSet.builder();
if (pattern.getType() == Type.TARGETS_BELOW_DIRECTORY) {
- for (PathFragment blacklistedPackagePrefix : blacklistedPackagePrefixes.get()) {
- PackageIdentifier pkgIdForBlacklistedDirectorPrefix =
+ for (PathFragment ignoredPackagePrefix : ignoredPackagePrefixes.get()) {
+ PackageIdentifier pkgIdForIgnoredDirectorPrefix =
PackageIdentifier.create(
pattern.getDirectoryForTargetsUnderDirectory().getRepository(),
- blacklistedPackagePrefix);
- if (pattern.containsAllTransitiveSubdirectoriesForTBD(
- pkgIdForBlacklistedDirectorPrefix)) {
- blacklistedPathsBuilder.add(blacklistedPackagePrefix);
+ ignoredPackagePrefix);
+ if (pattern.containsAllTransitiveSubdirectoriesForTBD(pkgIdForIgnoredDirectorPrefix)) {
+ ignoredPathsBuilder.add(ignoredPackagePrefix);
}
}
}
- return blacklistedPathsBuilder.build();
+ return ignoredPathsBuilder.build();
}
@Override
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoader.java b/src/main/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoader.java
index 8f588f6..554d671 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoader.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoader.java
@@ -44,7 +44,6 @@
import com.google.devtools.build.lib.pkgcache.PathPackageLocator;
import com.google.devtools.build.lib.repository.ExternalPackageHelper;
import com.google.devtools.build.lib.skyframe.ASTFileLookupFunction;
-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;
@@ -54,6 +53,7 @@
import com.google.devtools.build.lib.skyframe.FileStateFunction;
import com.google.devtools.build.lib.skyframe.FileSymlinkCycleUniquenessFunction;
import com.google.devtools.build.lib.skyframe.FileSymlinkInfiniteExpansionUniquenessFunction;
+import com.google.devtools.build.lib.skyframe.IgnoredPackagePrefixesFunction;
import com.google.devtools.build.lib.skyframe.ManagedDirectoriesKnowledge;
import com.google.devtools.build.lib.skyframe.PackageFunction;
import com.google.devtools.build.lib.skyframe.PackageFunction.ActionOnIOExceptionReadingBuildFile;
@@ -437,9 +437,9 @@
getBuildFilesByPriority(),
getExternalPackageHelper()))
.put(
- SkyFunctions.BLACKLISTED_PACKAGE_PREFIXES,
- new BlacklistedPackagePrefixesFunction(
- /*blacklistedPackagePrefixesFile=*/ PathFragment.EMPTY_FRAGMENT))
+ SkyFunctions.IGNORED_PACKAGE_PREFIXES,
+ new IgnoredPackagePrefixesFunction(
+ /*ignoredPackagePrefixesFile=*/ PathFragment.EMPTY_FRAGMENT))
.put(SkyFunctions.CONTAINING_PACKAGE_LOOKUP, new ContainingPackageLookupFunction())
.put(
SkyFunctions.AST_FILE_LOOKUP,
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/packages/BUILD b/src/main/java/com/google/devtools/build/lib/skyframe/packages/BUILD
index b6909ca..bf66fc5 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/packages/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/packages/BUILD
@@ -38,11 +38,11 @@
"//src/main/java/com/google/devtools/build/lib/packages",
"//src/main/java/com/google/devtools/build/lib/pkgcache",
"//src/main/java/com/google/devtools/build/lib/repository:external_package_helper",
- "//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:file_symlink_cycle_uniqueness_function",
"//src/main/java/com/google/devtools/build/lib/skyframe:file_symlink_infinite_expansion_uniqueness_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:package_value",
