Create --incompatible_remap_main_repo flag. This flag fixes a bug in bazel where within a repository called "foo", the labels @foo//some/path:bar.bzl and //some/path:bar.bzl were treated as different labels. It is unlikely that this flag will affect any projects but it is technically a breaking change and so it is guarded behind a flag. Towards #7130 RELNOTES: None PiperOrigin-RevId: 229813128
diff --git a/src/test/java/com/google/devtools/build/lib/packages/SkylarkSemanticsConsistencyTest.java b/src/test/java/com/google/devtools/build/lib/packages/SkylarkSemanticsConsistencyTest.java index 0ea7ef7..b31a3d5 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/SkylarkSemanticsConsistencyTest.java +++ b/src/test/java/com/google/devtools/build/lib/packages/SkylarkSemanticsConsistencyTest.java
@@ -130,7 +130,6 @@ + "," + rand.nextDouble(), "--experimental_platforms_api=" + rand.nextBoolean(), - "--experimental_remap_main_repo=" + rand.nextBoolean(), "--experimental_starlark_config_transitions=" + rand.nextBoolean(), "--experimental_transition_whitelist_location=" + rand.nextDouble(), "--incompatible_bzl_disallow_load_after_statement=" + rand.nextBoolean(), @@ -153,6 +152,7 @@ "--incompatible_no_support_tools_in_action_inputs=" + rand.nextBoolean(), "--incompatible_no_target_output_group=" + rand.nextBoolean(), "--incompatible_no_transitive_loads=" + rand.nextBoolean(), + "--incompatible_remap_main_repo=" + rand.nextBoolean(), "--incompatible_remove_native_maven_jar=" + rand.nextBoolean(), "--incompatible_require_feature_configuration_for_pic=" + rand.nextBoolean(), "--incompatible_strict_argument_ordering=" + rand.nextBoolean(), @@ -175,7 +175,6 @@ .experimentalJavaCommonCreateProviderEnabledPackages( ImmutableList.of(String.valueOf(rand.nextDouble()), String.valueOf(rand.nextDouble()))) .experimentalPlatformsApi(rand.nextBoolean()) - .experimentalRemapMainRepo(rand.nextBoolean()) .experimentalStarlarkConfigTransitions(rand.nextBoolean()) .experimentalTransitionWhitelistLocation(String.valueOf(rand.nextDouble())) .incompatibleBzlDisallowLoadAfterStatement(rand.nextBoolean()) @@ -198,6 +197,7 @@ .incompatibleNoSupportToolsInActionInputs(rand.nextBoolean()) .incompatibleNoTargetOutputGroup(rand.nextBoolean()) .incompatibleNoTransitiveLoads(rand.nextBoolean()) + .incompatibleRemapMainRepo(rand.nextBoolean()) .incompatibleRemoveNativeMavenJar(rand.nextBoolean()) .incompatibleRequireFeatureConfigurationForPic(rand.nextBoolean()) .incompatibleStricArgumentOrdering(rand.nextBoolean())
diff --git a/src/test/java/com/google/devtools/build/lib/packages/WorkspaceFactoryTest.java b/src/test/java/com/google/devtools/build/lib/packages/WorkspaceFactoryTest.java index 95fdca0..bcd395f 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/WorkspaceFactoryTest.java +++ b/src/test/java/com/google/devtools/build/lib/packages/WorkspaceFactoryTest.java
@@ -204,7 +204,7 @@ @Test public void testImplicitMainRepoRename() throws Exception { - helper.setSkylarkSemantics("--experimental_remap_main_repo"); + helper.setSkylarkSemantics("--incompatible_remap_main_repo"); helper.parse("workspace(name = 'foo')"); assertMapping(helper, "@", "@foo", "@"); }
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/RepositoryMappingFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/RepositoryMappingFunctionTest.java index f7d10db..7da92b6 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/RepositoryMappingFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/RepositoryMappingFunctionTest.java
@@ -146,7 +146,7 @@ @Test public void testDefaultMainRepoNameInMapping() throws Exception { - setSkylarkSemanticsOptions("--experimental_remap_main_repo"); + setSkylarkSemanticsOptions("--incompatible_remap_main_repo"); scratch.overwriteFile( "WORKSPACE", "local_repository(", @@ -168,7 +168,7 @@ @Test public void testExplicitMainRepoNameInMapping() throws Exception { - setSkylarkSemanticsOptions("--experimental_remap_main_repo"); + setSkylarkSemanticsOptions("--incompatible_remap_main_repo"); scratch.overwriteFile( "WORKSPACE", "workspace(name = 'good')",