Automated rollback of commit 15b70bb63e5495290900de9303cbebb0ff12210b.
*** Reason for rollback ***
Roll forward
*** Original change description ***
Automated rollback of commit f7f5415af74bda139d7e24bc3e0db1b9b470e7e5.
*** Reason for rollback ***
Breaks things inside Google. I'll roll it forward in a few days.
*** Original change description ***
Enable --incompatible_no_transitive_loads by default
Fixes https://github.com/bazelbuild/bazel/issues/5636
Tested: https://buildkite.com/bazel/bazelisk-plus-incompatible-flags/builds/48
RELNOTES: --incompatible_no_transitive_loads is enabled by default.
PiperOrigin-RevId: 239798602
diff --git a/src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java b/src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java
index 959184f..f8e6a94 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java
@@ -464,7 +464,7 @@
@Option(
name = "incompatible_no_transitive_loads",
- defaultValue = "false",
+ defaultValue = "true",
documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS,
effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS},
metadataTags = {
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/StarlarkSemantics.java b/src/main/java/com/google/devtools/build/lib/syntax/StarlarkSemantics.java
index c32e915..7485233 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/StarlarkSemantics.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/StarlarkSemantics.java
@@ -233,7 +233,7 @@
.incompatibleNoOutputAttrDefault(false)
.incompatibleNoSupportToolsInActionInputs(false)
.incompatibleNoTargetOutputGroup(false)
- .incompatibleNoTransitiveLoads(false)
+ .incompatibleNoTransitiveLoads(true)
.incompatibleRemapMainRepo(false)
.incompatibleRemoveNativeMavenJar(false)
.incompatibleRequireFeatureConfigurationForPic(true)
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/SkylarkImportLookupFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/SkylarkImportLookupFunctionTest.java
index c05b615..5dad405 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/SkylarkImportLookupFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/SkylarkImportLookupFunctionTest.java
@@ -477,7 +477,5 @@
assertThat(result.get(skylarkImportLookupKey).getEnvironmentExtension().getBindings())
.containsEntry("a_symbol", 5);
- assertThat(result.get(skylarkImportLookupKey).getEnvironmentExtension().getBindings())
- .containsEntry("y_symbol", 5);
}
}