Move --repo_env to common options

--repo_env should be a common option, it causes issues with repository syncing.

Upstream PR: bazelbuild#13003
---
Automatic squash commit from https://github.sc-corp.net/Snapchat/bazel/pull/93
Cooled by chancila

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

@@ -366,20 +366,6 @@ public String getTypeDescription() {
               + " wins, options for different variables accumulate.")
   public List<Map.Entry<String, String>> hostActionEnvironment;
 
-  @Option(
-      name = "repo_env",
-      converter = Converters.OptionalAssignmentConverter.class,
-      allowMultiple = true,
-      defaultValue = "null",
-      documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS,
-      effectTags = {OptionEffectTag.ACTION_COMMAND_LINES},
-      help =
-          "Specifies additional environment variables to be available only for repository rules."
-              + " Note that repository rules see the full environment anyway, but in this way"
-              + " configuration information can be passed to repositories through options without"
-              + " invalidating the action graph.")
-  public List<Map.Entry<String, String>> repositoryEnvironment;
-
   @Option(
       name = "collect_code_coverage",
       defaultValue = "false",

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

@@ -86,6 +86,7 @@ public class CommandEnvironment {
   private final Set<String> visibleActionEnv = new TreeSet<>();
   private final Set<String> visibleTestEnv = new TreeSet<>();
   private final Map<String, String> repoEnv = new TreeMap<>();
+  private final Map<String, String> repoEnvFromOptions = new TreeMap<>();
   private final TimestampGranularityMonitor timestampGranularityMonitor;
   private final Thread commandThread;
   private final Command command;
@@ -235,11 +236,9 @@ public void exit(AbruptExitException exception) {
       }
     }
 
-    CoreOptions configOpts = options.getOptions(CoreOptions.class);
-    if (configOpts != null) {
-      for (Map.Entry<String, String> entry : configOpts.repositoryEnvironment) {
-        repoEnv.put(entry.getKey(), entry.getValue());
-      }
+    for (Map.Entry<String, String> entry : commandOptions.repositoryEnvironment) {
+      repoEnv.put(entry.getKey(), entry.getValue());
+      repoEnvFromOptions.put(entry.getKey(), entry.getValue());
     }
   }
 
@@ -672,6 +671,7 @@ public void syncPackageLoading(OptionsProvider options)
             options.getOptions(BuildLanguageOptions.class),
             getCommandId(),
             clientEnv,
+            repoEnvFromOptions,
             timestampGranularityMonitor,
             options);
   }
@@ -781,4 +781,4 @@ public MetadataProvider getFileCache() {
       return fileCache;
     }
   }
-}
+}

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

@@ -489,6 +489,20 @@ public String getTypeDescription() {
               + "one.")
   public boolean keepStateAfterBuild;
 
+  @Option(
+          name = "repo_env",
+          converter = Converters.OptionalAssignmentConverter.class,
+          allowMultiple = true,
+          defaultValue = "null",
+          documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS,
+          effectTags = {OptionEffectTag.ACTION_COMMAND_LINES},
+          help =
+                  "Specifies additional environment variables to be available only for repository rules."
+                          + " Note that repository rules see the full environment anyway, but in this way"
+                          + " configuration information can be passed to repositories through options without"
+                          + " invalidating the action graph.")
+  public List<Map.Entry<String, String>> repositoryEnvironment;
+
   /** The option converter to check that the user can only specify legal profiler tasks. */
   public static class ProfilerTaskConverter extends EnumConverter<ProfilerTask> {
     public ProfilerTaskConverter() {

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

@@ -236,6 +236,7 @@ public void sync(
       BuildLanguageOptions starlarkSemanticsOptions,
       UUID commandId,
       Map<String, String> clientEnv,
+      Map<String, String> repoEnvOption,
       TimestampGranularityMonitor tsgm,
       OptionsProvider options)
       throws InterruptedException, AbruptExitException {
@@ -261,6 +262,7 @@ public void sync(
         starlarkSemanticsOptions,
         commandId,
         clientEnv,
+        repoEnvOption,
         tsgm,
         options);
     long startTime = System.nanoTime();

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

@@ -2640,11 +2640,12 @@ public void sync(
       BuildLanguageOptions starlarkSemanticsOptions,
       UUID commandId,
       Map<String, String> clientEnv,
+      Map<String, String> repoEnvOption,
       TimestampGranularityMonitor tsgm,
       OptionsProvider options)
       throws InterruptedException, AbruptExitException {
     getActionEnvFromOptions(options.getOptions(CoreOptions.class));
-    setRepoEnv(options.getOptions(CoreOptions.class));
+    PrecomputedValue.REPO_ENV.set(injectable(), new LinkedHashMap<>(repoEnvOption));
     RemoteOptions remoteOptions = options.getOptions(RemoteOptions.class);
     setRemoteOutputsMode(
         remoteOptions != null
@@ -2729,16 +2730,6 @@ public void setActionEnv(Map<String, String> actionEnv) {
     PrecomputedValue.ACTION_ENV.set(injectable(), actionEnv);
   }
 
-  private void setRepoEnv(CoreOptions opt) {
-    LinkedHashMap<String, String> repoEnv = new LinkedHashMap<>();
-    if (opt != null) {
-      for (Map.Entry<String, String> v : opt.repositoryEnvironment) {
-        repoEnv.put(v.getKey(), v.getValue());
-      }
-    }
-    PrecomputedValue.REPO_ENV.set(injectable(), repoEnv);
-  }
-
   public PathPackageLocator createPackageLocator(
       ExtendedEventHandler eventHandler, List<String> packagePaths, Path workingDirectory) {
     return PathPackageLocator.create(

src/test/java/com/google/devtools/build/lib/query2/testutil/SkyframeQueryHelper.java

@@ -281,6 +281,7 @@ protected void initTargetPatternEvaluator(ConfiguredRuleClassProvider ruleClassP
     this.toolsRepository = ruleClassProvider.getToolsRepository();
     skyframeExecutor = createSkyframeExecutor(ruleClassProvider);
     PackageOptions packageOptions = Options.getDefaults(PackageOptions.class);
+
     packageOptions.defaultVisibility = ConstantRuleVisibility.PRIVATE;
     packageOptions.showLoadingProgress = true;
     packageOptions.globbingThreads = 7;
@@ -296,6 +297,7 @@ protected void initTargetPatternEvaluator(ConfiguredRuleClassProvider ruleClassP
           Options.getDefaults(BuildLanguageOptions.class),
           UUID.randomUUID(),
           ImmutableMap.<String, String>of(),
+          ImmutableMap.<String, String>of(),
           new TimestampGranularityMonitor(BlazeClock.instance()),
           OptionsProvider.EMPTY);
     } catch (InterruptedException | AbruptExitException e) {

src/test/java/com/google/devtools/build/lib/skyframe/AbstractCollectPackagesUnderDirectoryTest.java

@@ -309,6 +309,7 @@ private void initBuildDriver() throws AbruptExitException, InterruptedException,
         Options.getDefaults(BuildLanguageOptions.class),
         UUID.randomUUID(),
         /*clientEnv=*/ ImmutableMap.of(),
+        /*repoEnv=*/ ImmutableMap.of(),
         new TimestampGranularityMonitor(BlazeClock.instance()),
         OptionsProvider.EMPTY);
     buildDriver = skyframeExecutor.getDriver();