aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalValue.java
diff options
context:
space:
mode:
authorGravatar tomlu <tomlu@google.com>2018-01-19 09:28:06 -0800
committerGravatar Copybara-Service <copybara-piper@google.com>2018-01-19 09:30:16 -0800
commit8cc5dcf34cf5156db78ccf5f936ca3c8b893c36f (patch)
tree5d10eb07b1c4bcd43c36ac4dc02c31a18a2fe3d0 /src/main/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalValue.java
parent8608df20d98873d1aecf2d6f08836d0b56f826fa (diff)
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
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalValue.java')
-rw-r--r--src/main/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalValue.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalValue.java
index d3bbc160f7..e791b5c202 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalValue.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalValue.java
@@ -168,8 +168,8 @@ public final class RecursiveFilesystemTraversalValue implements SkyValue {
* originally assumed.
*/
TraversalRequest forChangedRootPath(Root newRoot) {
- return duplicate(RootedPath.toRootedPath(newRoot, path.getRelativePath()),
- skipTestingForSubpackage);
+ return duplicate(
+ RootedPath.toRootedPath(newRoot, path.getRootRelativePath()), skipTestingForSubpackage);
}
@Override
@@ -214,7 +214,7 @@ public final class RecursiveFilesystemTraversalValue implements SkyValue {
}
PathFragment getNameInSymlinkTree() {
- return linkName.getRelativePath();
+ return linkName.getRootRelativePath();
}
@Override
@@ -301,7 +301,7 @@ public final class RecursiveFilesystemTraversalValue implements SkyValue {
@Override
public PathFragment getNameInSymlinkTree() {
- return path.getRelativePath();
+ return path.getRootRelativePath();
}
@Override
@@ -360,7 +360,7 @@ public final class RecursiveFilesystemTraversalValue implements SkyValue {
@Override
public PathFragment getNameInSymlinkTree() {
- return path.getRelativePath();
+ return path.getRootRelativePath();
}
@Override