Deprecate --incompatible_repo_env_ignores_action_env

Author: Silic0nS0ldier

src/main/java/com/google/devtools/build/lib/analysis/config/CoreOptions.java

@@ -463,9 +463,6 @@ If specified, the value of the cpu constraint (`@platforms//cpu:cpu`) of
           `=name`, which unsets the variable of that name. This option can be used
           multiple times; for options given for the same variable, the latest wins,
           options for different variables accumulate.
-
-          Note that unless `--incompatible_repo_env_ignores_action_env` is true, all `name=value`
-          pairs will be available to repository rules.
           """)
   public List<Converters.EnvVar> actionEnvironment;
 

src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRulesModule.java

@@ -965,6 +965,16 @@ public static final class AllCommandGraveyardOptions extends OptionsBase {
         effectTags = {OptionEffectTag.NO_OP},
         help = "No-op.")
     public boolean legacyLocalFallback;
+
+    @Deprecated
+    @Option(
+      name = "incompatible_repo_env_ignores_action_env",
+      defaultValue = "true",
+      documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
+      effectTags = {OptionEffectTag.NO_OP},
+      metadataTags = {OptionMetadataTag.DEPRECATED},
+      help = "No-op.")
+  public boolean repoEnvIgnoresActionEnv;
   }
 
   @Override

src/main/java/com/google/devtools/build/lib/runtime/CommandEnvironment.java

@@ -345,18 +345,12 @@ public void exit(AbruptExitException exception) {
         switch (envVar) {
           case Converters.EnvVar.Set(String name, String value) -> {
             visibleActionEnv.remove(name);
-            if (!options.getOptions(CommonCommandOptions.class).repoEnvIgnoresActionEnv) {
-              repoEnv.put(name, value);
-            }
           }
           case Converters.EnvVar.Inherit(String name) -> {
             visibleActionEnv.add(name);
           }
           case Converters.EnvVar.Unset(String name) -> {
             visibleActionEnv.remove(name);
-            if (!options.getOptions(CommonCommandOptions.class).repoEnvIgnoresActionEnv) {
-              repoEnv.remove(name);
-            }
           }
         }
       }
@@ -972,9 +966,7 @@ public String determineOutputFileSystem() {
   }
 
   /**
-   * Returns the repository environment created from the client environment, {@code --repo_env}, and
-   * {@code --action_env=NAME=VALUE} (when {@code
-   * --incompatible_repo_env_ignores_action_env=false}).
+   * Returns the repository environment created from the client environment and {@code --repo_env}.
    */
   public Map<String, String> getRepoEnv() {
     return Collections.unmodifiableMap(repoEnv);

src/main/java/com/google/devtools/build/lib/runtime/CommonCommandOptions.java

@@ -621,19 +621,6 @@ public String getTypeDescription() {
           """)
   public List<Converters.EnvVar> repositoryEnvironment;
 
-  @Option(
-      name = "incompatible_repo_env_ignores_action_env",
-      defaultValue = "true",
-      documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
-      effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS},
-      metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE},
-      help =
-          """
-          If true, <code>--action_env=NAME=VALUE</code> will no longer affect repository rule \
-          and module extension environments.
-          """)
-  public boolean repoEnvIgnoresActionEnv;
-
   @Option(
       name = "heuristically_drop_nodes",
       oldName = "experimental_heuristically_drop_nodes",