Put main repo remapping behind a flag.

RELNOTES: None
PiperOrigin-RevId: 207801155

4 files changed, 23 insertions, 15 deletions

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 21328c8ff1..5bc110986c 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
@@ -123,6 +123,7 @@ public class SkylarkSemanticsConsistencyTest {
             + ","
             + rand.nextDouble(),
         "--experimental_enable_repo_mapping=" + rand.nextBoolean(),
+        "--experimental_remap_main_repo=" + rand.nextBoolean(),
         "--incompatible_bzl_disallow_load_after_statement=" + rand.nextBoolean(),
         "--incompatible_depset_is_not_iterable=" + rand.nextBoolean(),
         "--incompatible_depset_union=" + rand.nextBoolean(),
@@ -155,6 +156,7 @@ public class SkylarkSemanticsConsistencyTest {
         .experimentalCcSkylarkApiEnabledPackages(
             ImmutableList.of(String.valueOf(rand.nextDouble()), String.valueOf(rand.nextDouble())))
         .experimentalEnableRepoMapping(rand.nextBoolean())
+        .experimentalRemapMainRepo(rand.nextBoolean())
         .incompatibleBzlDisallowLoadAfterStatement(rand.nextBoolean())
         .incompatibleDepsetIsNotIterable(rand.nextBoolean())
         .incompatibleDepsetUnion(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 de9b48e825..c964539e7a 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
@@ -129,7 +129,6 @@ public class WorkspaceFactoryTest {
         "    repo_mapping = {'@x' : '@y'},",
         ")");
     assertMapping(helper, "@foo", "@x", "@y");
-    assertMapping(helper, "@foo", "@bar", "@");
   }
   
   @Test
@@ -200,11 +199,20 @@ public class WorkspaceFactoryTest {
 
   @Test
   public void testImplicitMainRepoRename() throws Exception {
+    helper.setSkylarkSemantics("--experimental_remap_main_repo");
     helper.parse("workspace(name = 'foo')");
     assertMapping(helper, "@", "@foo", "@");
   }
 
   @Test
+  public void testNoImplicitMainRepoRenameWithoutFlag() throws Exception {
+    helper.parse("workspace(name = 'foo')");
+    RepositoryName foo = RepositoryName.create("@foo");
+    assertThat(helper.getPackage().getRepositoryMapping("@"))
+        .doesNotContainEntry(foo, RepositoryName.MAIN);
+  }
+
+  @Test
   public void testEmptyRepositoryHasEmptyMap() throws Exception {
     helper.parse("");
     assertThat(helper.getPackage().getRepositoryMapping("@")).isEmpty();
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 737fa5b51c..78a95305f6 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
@@ -67,9 +67,7 @@ public class RepositoryMappingFunctionTest extends BuildViewTestCase {
         .hasEntryThat(skyKey)
         .isEqualTo(
             RepositoryMappingValue.withMapping(
-                ImmutableMap.of(
-                    RepositoryName.create("@good"), RepositoryName.MAIN,
-                    RepositoryName.create("@a"), RepositoryName.create("@b"))));
+                ImmutableMap.of(RepositoryName.create("@a"), RepositoryName.create("@b"))));
   }
 
   @Test
@@ -97,16 +95,12 @@ public class RepositoryMappingFunctionTest extends BuildViewTestCase {
         .hasEntryThat(skyKey1)
         .isEqualTo(
             RepositoryMappingValue.withMapping(
-                ImmutableMap.of(
-                    RepositoryName.create("@good"), RepositoryName.MAIN,
-                    RepositoryName.create("@a"), RepositoryName.create("@b"))));
+                ImmutableMap.of(RepositoryName.create("@a"), RepositoryName.create("@b"))));
     assertThatEvaluationResult(eval(skyKey2))
         .hasEntryThat(skyKey2)
         .isEqualTo(
             RepositoryMappingValue.withMapping(
-                ImmutableMap.of(
-                    RepositoryName.create("@good"), RepositoryName.MAIN,
-                    RepositoryName.create("@x"), RepositoryName.create("@y"))));
+                ImmutableMap.of(RepositoryName.create("@x"), RepositoryName.create("@y"))));
   }
 
   @Test
@@ -128,7 +122,6 @@ public class RepositoryMappingFunctionTest extends BuildViewTestCase {
         .isEqualTo(
             RepositoryMappingValue.withMapping(
                 ImmutableMap.of(
-                    RepositoryName.create("@good"), RepositoryName.MAIN,
                     RepositoryName.create("@a"), RepositoryName.create("@b"),
                     RepositoryName.create("@x"), RepositoryName.create("@y"))));
   }
@@ -157,7 +150,8 @@ public class RepositoryMappingFunctionTest extends BuildViewTestCase {
 
   @Test
   public void testDefaultMainRepoNameInMapping() throws Exception {
-    setSkylarkSemanticsOptions("--experimental_enable_repo_mapping");
+    setSkylarkSemanticsOptions(
+        "--experimental_remap_main_repo", "--experimental_enable_repo_mapping");
     scratch.overwriteFile(
         "WORKSPACE",
         "local_repository(",
@@ -179,6 +173,7 @@ public class RepositoryMappingFunctionTest extends BuildViewTestCase {
 
   @Test
   public void testExplicitMainRepoNameInMapping() throws Exception {
+    setSkylarkSemanticsOptions("--experimental_remap_main_repo");
     scratch.overwriteFile(
         "WORKSPACE",
         "workspace(name = 'good')",
diff --git a/src/test/shell/bazel/workspace_test.sh b/src/test/shell/bazel/workspace_test.sh
index 680d71153e..daed1375c4 100755
--- a/src/test/shell/bazel/workspace_test.sh
+++ b/src/test/shell/bazel/workspace_test.sh
@@ -574,7 +574,8 @@ a = 1
 EOF
 
   cd mainrepo
-  bazel query //... &>"$TEST_log" || fail "Expected query to succeed"
+  bazel query --experimental_remap_main_repo //... &>"$TEST_log" \
+      || fail "Expected query to succeed"
   expect_log "def.bzl loaded"
   expect_not_log "external"
 }
@@ -601,7 +602,8 @@ EOF
   # the bzl file should be loaded from the main workspace and
   # not as an external repository
   cd mainrepo
-  bazel query @a//... &>"$TEST_log" || fail "Expected query to succeed"
+  bazel query --experimental_remap_main_repo @a//... &>"$TEST_log" \
+      || fail "Expected query to succeed"
   expect_log "def.bzl loaded"
   expect_not_log "external"
 
@@ -618,7 +620,8 @@ EOF
   # now that @mainrepo doesn't exist within workspace "a",
   # the query should fail
   cd mainrepo
-  bazel query --experimental_enable_repo_mapping @a//... &>"$TEST_log" \
+  bazel query --experimental_remap_main_repo --experimental_enable_repo_mapping \
+      @a//... &>"$TEST_log" \
       && fail "Failure expected" || true
 }