Rename relativePath -> rootRelativePath in Root and friends.

This makes it clearer that the path fragments in question are relative *to the root*. Confusingly, when the root is absolute, the root relative fragment is also absolute. This makes it a tiny bit clearer that the path fragment may be absolute.

PiperOrigin-RevId: 182544893

1 files changed, 6 insertions, 4 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/FileFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/FileFunction.java
index 9cae797a5f..dc04d4b306 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/FileFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/FileFunction.java
@@ -55,7 +55,7 @@ public class FileFunction implements SkyFunction {
     RootedPath rootedPath = (RootedPath) skyKey.argument();
     RootedPath realRootedPath = null;
     FileStateValue realFileStateValue = null;
-    PathFragment relativePath = rootedPath.getRelativePath();
+    PathFragment relativePath = rootedPath.getRootRelativePath();
 
     // Resolve ancestor symlinks, but only if the current file is not the filesystem root (has no
     // parent) or a package path root (treated opaquely and handled by skyframe's DiffAwareness
@@ -117,7 +117,7 @@ public class FileFunction implements SkyFunction {
   private static Pair<RootedPath, FileStateValue> resolveFromAncestors(
       RootedPath rootedPath, Environment env)
       throws FileFunctionException, InterruptedException {
-    PathFragment relativePath = rootedPath.getRelativePath();
+    PathFragment relativePath = rootedPath.getRootRelativePath();
     RootedPath realRootedPath = rootedPath;
     FileValue parentFileValue = null;
     PathFragment parentDirectory = relativePath.getParentDirectory();
@@ -130,8 +130,10 @@ public class FileFunction implements SkyFunction {
       }
       PathFragment baseName = PathFragment.create(relativePath.getBaseName());
       RootedPath parentRealRootedPath = parentFileValue.realRootedPath();
-      realRootedPath = RootedPath.toRootedPath(parentRealRootedPath.getRoot(),
-          parentRealRootedPath.getRelativePath().getRelative(baseName));
+      realRootedPath =
+          RootedPath.toRootedPath(
+              parentRealRootedPath.getRoot(),
+              parentRealRootedPath.getRootRelativePath().getRelative(baseName));
 
       if (!parentFileValue.exists()) {
         return Pair.<RootedPath, FileStateValue>of(