Rollback of commit 0c7a42a09d85ddffd9b860bcb31e4c43a00632c1.

*** Reason for rollback ***

[]

*** Original change description ***

Slight refactor of ExternalFilesHelper:
-Make FileType and ExternalFileAction public.
-Have producers use ExternalFileAction, rather than a boolean, to specify the desired behavior.

And a big change in semantics (doesn't affect Bazel):
-Replace ExternalFileAction.ERROR_OUT with ExternalFileAction.ASSUME_NON_EXISTENT_AND_IMMUTABLE, which does what it sounds like. This new action, like the old ERROR_OUT, is _not_ used in Bazel.

--
MOS_MIGRATED_REVID=136206810

1 files changed, 6 insertions, 4 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/DirectoryListingStateFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/DirectoryListingStateFunction.java
index 307c74b22a..aa1fe760e2 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/DirectoryListingStateFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/DirectoryListingStateFunction.java
@@ -45,10 +45,8 @@ public class DirectoryListingStateFunction implements SkyFunction {
         return null;
       }
       return DirectoryListingStateValue.create(dirRootedPath);
-    } catch (ExternalFilesHelper.NonexistentImmutableExternalFileException e) {
-      // DirectoryListingStateValue.key assumes the path exists. This exception here is therefore
-      // indicative of a programming bug.
-      throw new IllegalStateException(dirRootedPath.toString(), e);
+    } catch (FileOutsidePackageRootsException e) {
+      throw new DirectoryListingStateFunctionException(e);
     } catch (IOException e) {
       throw new DirectoryListingStateFunctionException(e);
     }
@@ -68,5 +66,9 @@ public class DirectoryListingStateFunction implements SkyFunction {
     public DirectoryListingStateFunctionException(IOException e) {
       super(e, Transience.TRANSIENT);
     }
+
+    public DirectoryListingStateFunctionException(FileOutsidePackageRootsException e) {
+      super(e, Transience.PERSISTENT);
+    }
   }
 }