Remove the command line option --remove_all_convenience_symlinks.

RELNOTES[INC]: The command line option --remove_all_convenience_symlinks is not available anymore.

PiperOrigin-RevId: 569149907
Change-Id: I24ca4f4f21285bac9cc69b8a990b23a8412b9178

Author: lberki

src/main/java/com/google/devtools/build/lib/buildtool/OutputDirectoryLinksUtils.java

@@ -14,7 +14,6 @@
 package com.google.devtools.build.lib.buildtool;
 
 import com.google.common.base.Joiner;
-import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
@@ -35,7 +34,6 @@
 import com.google.devtools.build.lib.vfs.PathFragment;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
@@ -186,49 +184,6 @@ public static PathPrettyPrinter getPathPrettyPrinter(
         getAllLinkDefinitions(symlinkDefinitions), symlinkPrefix, productName, workspaceDirectory);
   }
 
-  private static void removeAllSymlinks(
-      List<String> failures, Path workspace, Path outputBase, String symlinkPrefix) {
-
-    // Get the prefix directory relative to the workspace.
-    Path symlinkPrefixDirectory = workspace.getRelative(symlinkPrefix);
-    Path directoryWithSymlinks =
-        // Handle the special case when the prefix is just a path.
-        // Otherwise we need to go one level up.
-        symlinkPrefix.endsWith("/")
-            ? symlinkPrefixDirectory
-            // This will return the workspace if the prefix was not a directory.
-            : symlinkPrefixDirectory.getParentDirectory();
-    Preconditions.checkNotNull(
-        directoryWithSymlinks, "Invalid symlink_prefix provided: %s", symlinkPrefix);
-
-    // Try to get a list of all symlinks in the workspace.
-    Collection<Path> pathsInWorkspace;
-    try {
-      pathsInWorkspace = directoryWithSymlinks.getDirectoryEntries();
-    } catch (IOException e) {
-      failures.add(
-          String.format(
-              "Failed to list files under path %s: %s",
-              directoryWithSymlinks.getPathString(), e.getMessage()));
-      return;
-    }
-
-    // Iterate through all the files and delete any symbolic links that start with the prefix
-    // and point to the output directory.
-    for (Path entry : pathsInWorkspace) {
-      try {
-        if (entry.isSymbolicLink()
-            && entry.relativeTo(workspace).getPathString().startsWith(symlinkPrefix)
-            && entry.readSymbolicLink().startsWith(outputBase.asFragment())) {
-          logger.atFinest().log("Removing %s", entry);
-          entry.delete();
-        }
-      } catch (IOException e) {
-        failures.add(String.format("%s: %s", entry.getBaseName(), e.getMessage()));
-      }
-    }
-  }
-
   /**
    * Attempts to remove the convenience symlinks in the workspace directory.
    *
@@ -242,35 +197,28 @@ private static void removeAllSymlinks(
    * @param eventHandler the error eventHandler
    * @param symlinkPrefix the symlink prefix which should be removed
    * @param productName the product name
-   * @param removeAllConvenienceSymlinks Delete all symlinks with the given prefix, not just
-   *     predefined links.
    */
   public static void removeOutputDirectoryLinks(
       Iterable<SymlinkDefinition> symlinkDefinitions,
       Path workspace,
       Path outputBase,
       EventHandler eventHandler,
       String symlinkPrefix,
-      String productName,
-      boolean removeAllConvenienceSymlinks) {
+      String productName) {
     if (NO_CREATE_SYMLINKS_PREFIX.equals(symlinkPrefix)) {
       return;
     }
     List<String> failures = new ArrayList<>();
 
     String workspaceBaseName = workspace.getBaseName();
 
-    if (removeAllConvenienceSymlinks) {
-      removeAllSymlinks(failures, workspace, outputBase, symlinkPrefix);
-    } else {
-      for (SymlinkDefinition link : getAllLinkDefinitions(symlinkDefinitions)) {
-        removeLink(
-            workspace,
-            link.getLinkName(symlinkPrefix, productName, workspaceBaseName),
-            failures,
-            ImmutableList.builder(),
-            false);
-      }
+    for (SymlinkDefinition link : getAllLinkDefinitions(symlinkDefinitions)) {
+      removeLink(
+          workspace,
+          link.getLinkName(symlinkPrefix, productName, workspaceBaseName),
+          failures,
+          ImmutableList.builder(),
+          false);
     }
 
     FileSystemUtils.removeDirectoryAndParents(workspace, PathFragment.create(symlinkPrefix));

src/main/java/com/google/devtools/build/lib/runtime/commands/CleanCommand.java

@@ -102,17 +102,6 @@ public static class Options extends OptionsBase {
               + "in the background."
     )
     public boolean async;
-
-    @Option(
-        name = "remove_all_convenience_symlinks",
-        defaultValue = "false",
-        documentationCategory = OptionDocumentationCategory.OUTPUT_SELECTION,
-        effectTags = {OptionEffectTag.AFFECTS_OUTPUTS},
-        help =
-            "If true, all symlinks in the workspace with  the prefix symlink_prefix will be"
-                + " deleted. Without this flag, only symlinks with the predefined suffixes are"
-                + " cleaned.")
-    public boolean removeAllConvenienceSymlinks;
   }
 
   private final OS os;
@@ -149,13 +138,7 @@ public BlazeCommandResult exec(CommandEnvironment env, OptionsParsingResult opti
           options
               .getOptions(BuildRequestOptions.class)
               .getSymlinkPrefix(env.getRuntime().getProductName());
-      return actuallyClean(
-          env,
-          env.getOutputBase(),
-          cleanOptions.expunge,
-          async,
-          symlinkPrefix,
-          cleanOptions.removeAllConvenienceSymlinks);
+      return actuallyClean(env, env.getOutputBase(), cleanOptions.expunge, async, symlinkPrefix);
     } catch (CleanException e) {
       env.getReporter().handle(Event.error(e.getMessage()));
       return BlazeCommandResult.failureDetail(e.getFailureDetail());
@@ -227,12 +210,7 @@ private static void asyncClean(CommandEnvironment env, Path path, String pathIte
   }
 
   private BlazeCommandResult actuallyClean(
-      CommandEnvironment env,
-      Path outputBase,
-      boolean expunge,
-      boolean async,
-      String symlinkPrefix,
-      boolean removeAllConvenienceSymlinks)
+      CommandEnvironment env, Path outputBase, boolean expunge, boolean async, String symlinkPrefix)
       throws CleanException, InterruptedException {
     BlazeRuntime runtime = env.getRuntime();
     if (env.getOutputService() != null) {
@@ -317,8 +295,7 @@ private BlazeCommandResult actuallyClean(
         env.getOutputBase(),
         env.getReporter(),
         symlinkPrefix,
-        env.getRuntime().getProductName(),
-        removeAllConvenienceSymlinks);
+        env.getRuntime().getProductName());
 
     // shutdown on expunge cleans
     if (expunge) {