[8.0.0] Allow external top-level dir in Bzlmod-managed non-main rep…

…os (#24147)

Also remove an unused method.

RELNOTES: External repositories that are managed by Bzlmod can now
contain a top-level `external` directory or package.

Closes #24126.

PiperOrigin-RevId: 691521324
Change-Id: I84d11f2163ce5a6e34578afb6a2cc9793d78f0b1

Commit
0e2bcda

Co-authored-by: Fabian Meumertzheim <[email protected]>

src/main/java/com/google/devtools/build/lib/cmdline/Label.java

@@ -96,9 +96,7 @@ public final class Label implements Comparable<Label>, StarlarkValue, SkyKey, Co
           // Used for select's `//conditions:default` label (not a target)
           "conditions",
           // Used for the public and private visibility labels (not targets)
-          "visibility",
-          // There is only one //external package
-          LabelConstants.EXTERNAL_PACKAGE_NAME.getPathString());
+          "visibility");
 
   // Intern "__pkg__" and "__subpackages__" pseudo-targets, which appears in labels used for
   // visibility specifications. This saves a couple tenths of a percent of RAM off the loading
@@ -181,9 +179,17 @@ private static RepositoryName computeRepoNameWithRepoContext(
     if (parts.repo() == null) {
       // Certain package names when used without a "@" part are always absolutely in the main repo,
       // disregarding the current repo and repo mappings.
-      return ABSOLUTE_PACKAGE_NAMES.contains(parts.pkg())
-          ? RepositoryName.MAIN
-          : repoContext.currentRepo();
+      if (ABSOLUTE_PACKAGE_NAMES.contains(parts.pkg())) {
+        return RepositoryName.MAIN;
+      }
+      // The legacy //external package can only be referenced by external repos defined in
+      // WORKSPACE, which never use strict visibility. For the main repo repoContext.currentRepo()
+      // is equal to RepositoryName.MAIN.
+      if (LabelConstants.EXTERNAL_PACKAGE_NAME.getPathString().equals(parts.pkg())
+          && repoContext.repoMapping().ownerRepo() == null) {
+        return RepositoryName.MAIN;
+      }
+      return repoContext.currentRepo();
     }
     if (parts.repoIsCanonical()) {
       // This label uses the canonical label literal syntax starting with two @'s ("@@foo//bar").

src/main/java/com/google/devtools/build/lib/cmdline/RepositoryName.java

@@ -253,20 +253,6 @@ public String getOwnerRepoDisplayString() {
     }
   }
 
-  // Must only be called if isVisible() returns true.
-  public String getOwnerModuleDisplayString() {
-    Preconditions.checkNotNull(ownerRepoIfNotVisible);
-    if (ownerRepoIfNotVisible.isMain()) {
-      return "root module";
-    } else {
-      return String.format(
-          "module '%s'",
-          ownerRepoIfNotVisible
-              .getName()
-              .substring(0, ownerRepoIfNotVisible.getName().indexOf('+')));
-    }
-  }
-
   /** Returns if this is the main repository. */
   public boolean isMain() {
     return equals(MAIN);

src/main/java/com/google/devtools/build/lib/skyframe/ProcessPackageDirectory.java

@@ -282,9 +282,11 @@ private Iterable<SkyKey> getSubdirDeps(
       }
       String basename = dirent.getName();
       PathFragment subdirectory = rootRelativePath.getRelative(basename);
-      if (!siblingRepositoryLayout && subdirectory.equals(LabelConstants.EXTERNAL_PACKAGE_NAME)) {
-        // Subpackages under //external can be processed only when
-        // --experimental_sibling_repository_layout is set.
+      if (!siblingRepositoryLayout
+          && subdirectory.equals(LabelConstants.EXTERNAL_PACKAGE_NAME)
+          && repositoryName.isMain()) {
+        // Subpackages under //external in the main repo can be processed only
+        // when --experimental_sibling_repository_layout is set.
         continue;
       }
 

src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java

@@ -109,7 +109,6 @@
 import com.google.devtools.build.lib.bazel.bzlmod.ModuleFileFunction;
 import com.google.devtools.build.lib.clock.BlazeClock;
 import com.google.devtools.build.lib.cmdline.Label;
-import com.google.devtools.build.lib.cmdline.LabelConstants;
 import com.google.devtools.build.lib.cmdline.LabelSyntaxException;
 import com.google.devtools.build.lib.cmdline.PackageIdentifier;
 import com.google.devtools.build.lib.cmdline.RepositoryMapping;
@@ -1279,12 +1278,7 @@ protected Rule scratchRule(String packageName, String ruleName, String... lines)
       throws Exception {
     // Allow to create the BUILD file also in the top package.
     String buildFilePathString = packageName.isEmpty() ? "BUILD" : packageName + "/BUILD";
-    if (packageName.equals(LabelConstants.EXTERNAL_PACKAGE_NAME.getPathString())) {
-      buildFilePathString = "WORKSPACE";
-      scratch.overwriteFile(buildFilePathString, lines);
-    } else {
-      scratch.file(buildFilePathString, lines);
-    }
+    scratch.file(buildFilePathString, lines);
     skyframeExecutor.invalidateFilesUnderPathForTesting(
         reporter,
         new ModifiedFileSet.Builder().modify(PathFragment.create(buildFilePathString)).build(),

src/test/shell/bazel/external_integration_test.sh

@@ -2950,6 +2950,52 @@ EOF
   expect_log "//external/nested:a2"
 }
 
+function test_query_external_packages_in_other_repo() {
+  cat > $(setup_module_dot_bazel) <<EOF
+local_repository = use_repo_rule("@bazel_tools//tools/build_defs/repo:local.bzl", "local_repository")
+local_repository(
+  name="other_repo",
+  path="other_repo",
+)
+EOF
+
+  mkdir -p other_repo/external/nested
+  mkdir -p other_repo/not-external
+
+  touch other_repo/REPO.bazel
+
+  cat > other_repo/external/BUILD <<EOF
+filegroup(
+    name = "a1",
+    srcs = [],
+)
+EOF
+  cat > other_repo/external/nested/BUILD <<EOF
+filegroup(
+    name = "a2",
+    srcs = [],
+)
+EOF
+
+  cat > other_repo/not-external/BUILD <<EOF
+filegroup(
+    name = "b",
+    srcs = [],
+)
+EOF
+
+  bazel query @other_repo//... >& $TEST_log || fail "Expected build/run to succeed"
+  expect_log "@other_repo//not-external:b"
+  expect_log "@other_repo//external:a1"
+  expect_log "@other_repo//external/nested:a2"
+
+  bazel query --experimental_sibling_repository_layout @other_repo//... >& $TEST_log \ ||
+    fail "Expected build/run to succeed"
+  expect_log "@other_repo//not-external:b"
+  expect_log "@other_repo//external:a1"
+  expect_log "@other_repo//external/nested:a2"
+}
+
 function test_query_external_all_targets() {
   mkdir -p external/nested
   mkdir -p not-external
@@ -3136,4 +3182,60 @@ EOF
   expect_log "LAZYEVAL_KEY=xal3"
 }
 
+function test_external_package_in_other_repo() {
+  cat > $(setup_module_dot_bazel) <<EOF
+local_repository = use_repo_rule("@bazel_tools//tools/build_defs/repo:local.bzl", "local_repository")
+local_repository(
+  name="other_repo",
+  path="other_repo",
+)
+EOF
+
+  mkdir -p other_repo/external/java/a
+  touch other_repo/REPO.bazel
+
+  cat > other_repo/external/java/a/BUILD <<EOF
+java_library(name='a', srcs=['A.java'])
+EOF
+
+  cat > other_repo/external/java/a/A.java << EOF
+package a;
+public class A {
+  public static void main(String[] args) {
+    System.out.println("hello world");
+  }
+}
+EOF
+
+  bazel build @other_repo//external/java/a:a || fail "build failed"
+}
+
+function test_external_dir_in_other_repo() {
+  cat > $(setup_module_dot_bazel) <<EOF
+local_repository = use_repo_rule("@bazel_tools//tools/build_defs/repo:local.bzl", "local_repository")
+local_repository(
+  name="other_repo",
+  path="other_repo",
+)
+EOF
+
+  mkdir -p other_repo/external/java/a
+  touch other_repo/REPO.bazel
+
+  cat > other_repo/BUILD <<EOF
+java_library(name='a', srcs=['external/java/a/A.java'])
+EOF
+
+  cat > other_repo/external/java/a/A.java << EOF
+package a;
+public class A {
+  public static void main(String[] args) {
+    System.out.println("hello world");
+  }
+}
+EOF
+
+  bazel build @other_repo//:a || fail "build failed"
+}
+
 run_suite "external tests"