Improve error for --override_repository on a non-existent repo

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

@@ -19,10 +19,11 @@
 import com.google.devtools.build.lib.bazel.bzlmod.ModuleExtensionId;
 import com.google.devtools.build.lib.bazel.bzlmod.ModuleExtensionRepoMappingEntriesValue;
 import com.google.devtools.build.lib.bazel.bzlmod.ModuleKey;
-import com.google.devtools.build.lib.cmdline.LabelConstants;
+import com.google.devtools.build.lib.cmdline.PackageIdentifier;
 import com.google.devtools.build.lib.cmdline.RepositoryMapping;
 import com.google.devtools.build.lib.cmdline.RepositoryName;
-import com.google.devtools.build.lib.packages.BuildFileContainsErrorsException;
+import com.google.devtools.build.lib.packages.NoSuchPackageException;
+import com.google.devtools.build.lib.packages.NoSuchThingException;
 import com.google.devtools.build.lib.packages.RuleClassProvider;
 import com.google.devtools.build.lib.vfs.PathFragment;
 import com.google.devtools.build.skyframe.SkyFunction;
@@ -57,11 +58,15 @@ public SkyValue compute(SkyKey skyKey, Environment env)
     if (repositoryMappingValue == RepositoryMappingValue.NOT_FOUND_VALUE
         && REPOSITORY_OVERRIDES.get(env).containsKey(key.repoName())) {
       throw new RepositoryMappingFunctionException(
-          String.format(
-              "the repository %s does not exist, but has been specified as overridden with"
-                  + " --override_repository. Use --inject_repository instead to add a new"
-                  + " repository.",
-              key.repoName()));
+          // Use this rather than NoSuchThingException so that the error mentions the requested
+          // target.
+          new NoSuchPackageException(
+              PackageIdentifier.create(key.repoName(), PathFragment.EMPTY_FRAGMENT),
+              String.format(
+                  "the repository %s does not exist, but has been specified as overridden with"
+                      + " --override_repository. Use --inject_repository instead to add a new"
+                      + " repository.",
+                  key.repoName())));
     }
     return repositoryMappingValue;
   }
@@ -158,10 +163,8 @@ private static Optional<ModuleExtensionId> maybeGetModuleExtensionForRepo(
   }
 
   private static class RepositoryMappingFunctionException extends SkyFunctionException {
-    RepositoryMappingFunctionException(String message) {
-      super(
-          new BuildFileContainsErrorsException(LabelConstants.EXTERNAL_PACKAGE_IDENTIFIER, message),
-          Transience.PERSISTENT);
+    RepositoryMappingFunctionException(NoSuchThingException e) {
+      super(e, Transience.PERSISTENT);
     }
   }
 }

src/test/py/bazel/bzlmod/bazel_overrides_test.py

@@ -744,6 +744,51 @@ def testOverrideRepositoryOnNonExistentRepo(self):
         stderr,
     )
 
+    exit_code, _, stderr = self.RunBazel(
+      [
+        'build',
+        '--override_repository=my_repo=%workspace%/other_repo',
+        '@@my_repo//:target',
+      ],
+      allow_failure=True,
+    )
+    self.AssertNotExitCode(exit_code, 0, stderr)
+    self.assertIn(
+      "ERROR: Skipping '@@my_repo//:target': no such package '@@my_repo//': the repository @@my_repo does not exist, but has been specified as overridden with --override_repository. Use --inject_repository instead to add a new repository.",
+      stderr,
+    )
+
+  def testOverrideRepositoryOnUseRepoRule(self):
+    self.ScratchFile(
+        'MODULE.bazel',
+        [
+            (
+                'local_repository ='
+                ' use_repo_rule("@bazel_tools//tools/build_defs/repo:local.bzl",'
+                ' "local_repository")'
+            ),
+            'local_repository(',
+            '  name = "my_repo",',
+            '  path = "original_repo",',
+            ')',
+        ],
+    )
+
+    self.ScratchFile('original_repo/REPO.bazel')
+    self.ScratchFile('original_repo/BUILD', ['filegroup(name="original")'])
+
+    self.ScratchFile('override_repo/REPO.bazel')
+    self.ScratchFile('override_repo/BUILD', ['filegroup(name="overridden")'])
+
+    # Verify that the overridden repo is used
+    self.RunBazel(
+        [
+            'build',
+            '--override_repository=+local_repository+my_repo=%workspace%/override_repo',
+            '@my_repo//:overridden',
+        ],
+    )
+
 
 if __name__ == '__main__':
   absltest.main()