aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/cmdline/PackageIdentifier.java
diff options
context:
space:
mode:
authorGravatar twerth <twerth@google.com>2018-06-22 08:12:56 -0700
committerGravatar Copybara-Service <copybara-piper@google.com>2018-06-22 08:14:03 -0700
commit732dc512801c32207c252a76ca8d9e5544560339 (patch)
tree5c5301d766b78194d2d7e89bd103b565b53d236d /src/main/java/com/google/devtools/build/lib/cmdline/PackageIdentifier.java
parentdc97fd15dc53489211ca65fbbf85131853a559fc (diff)
Automated rollback of commit 5a9befc5602e71f7512074c303afbdcff5617cca.
RELNOTES: None *** Reason for rollback *** PiperOrigin-RevId: 201686843
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/cmdline/PackageIdentifier.java')
-rw-r--r--src/main/java/com/google/devtools/build/lib/cmdline/PackageIdentifier.java20
1 files changed, 3 insertions, 17 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/cmdline/PackageIdentifier.java b/src/main/java/com/google/devtools/build/lib/cmdline/PackageIdentifier.java
index 732e6a0642..8d7ad1910a 100644
--- a/src/main/java/com/google/devtools/build/lib/cmdline/PackageIdentifier.java
+++ b/src/main/java/com/google/devtools/build/lib/cmdline/PackageIdentifier.java
@@ -16,7 +16,6 @@ package com.google.devtools.build.lib.cmdline;
import com.google.common.base.Preconditions;
import com.google.common.collect.ComparisonChain;
-import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Interner;
import com.google.devtools.build.lib.concurrent.BlazeInterners;
import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
@@ -120,17 +119,10 @@ public final class PackageIdentifier
}
public static PackageIdentifier parse(String input) throws LabelSyntaxException {
- return parse(input, /* repo= */ null, /* repositoryMapping= */ null);
- }
-
- public static PackageIdentifier parse(
- String input, String repo, ImmutableMap<RepositoryName, RepositoryName> repositoryMapping)
- throws LabelSyntaxException {
+ String repo;
String packageName;
int packageStartPos = input.indexOf("//");
- if (repo != null) {
- packageName = input;
- } else if (input.startsWith("@") && packageStartPos > 0) {
+ if (input.startsWith("@") && packageStartPos > 0) {
repo = input.substring(0, packageStartPos);
packageName = input.substring(packageStartPos + 2);
} else if (input.startsWith("@")) {
@@ -153,13 +145,7 @@ public final class PackageIdentifier
throw new LabelSyntaxException(error);
}
- if (repositoryMapping != null) {
- RepositoryName repositoryName = RepositoryName.create(repo);
- repositoryName = repositoryMapping.getOrDefault(repositoryName, repositoryName);
- return create(repositoryName, PathFragment.create(packageName));
- } else {
- return create(repo, PathFragment.create(packageName));
- }
+ return create(repo, PathFragment.create(packageName));
}
public RepositoryName getRepository() {