Automated rollback of commit 15b70bb.

*** Reason for rollback *** Roll forward *** Original change description *** Automated rollback of commit f7f5415. *** 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 #5636 Tested: https://buildkite.com/bazel/bazelisk-plus-incompatible-flags/builds/48 RELNOTES: --incompatible_no_transitive_loads is enabled by default. PiperOrigin-RevId: 239798602
bazelbuild · Mar 22, 2019 · 684646e · 684646e
1 parent df94cac
commit 684646e
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 5 deletions.
diff --git a/site/docs/skylark/backward-compatibility.md b/site/docs/skylark/backward-compatibility.md
@@ -574,7 +574,7 @@ y = 1
 ```
 
 *   Flag: `--incompatible_no_transitive_loads`
-*   Default: `false`
+*   Default: `true`
 *   Introduced in: `0.19.0`
 *   Tracking issue: [#5636](https://github.com/bazelbuild/bazel/issues/5636)
 

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
@@ -464,7 +464,7 @@ public class StarlarkSemanticsOptions extends OptionsBase implements Serializabl
 
   @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
@@ -233,7 +233,7 @@ public static Builder builderWithDefaults() {
           .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
@@ -477,7 +477,5 @@ public void testLoadBzlFileFromWorkspaceWithRemapping() throws Exception {
 
     assertThat(result.get(skylarkImportLookupKey).getEnvironmentExtension().getBindings())
         .containsEntry("a_symbol", 5);
-    assertThat(result.get(skylarkImportLookupKey).getEnvironmentExtension().getBindings())
-        .containsEntry("y_symbol", 5);
   }
 }