From 732dc512801c32207c252a76ca8d9e5544560339 Mon Sep 17 00:00:00 2001 From: twerth Date: Fri, 22 Jun 2018 08:12:56 -0700 Subject: Automated rollback of commit 5a9befc5602e71f7512074c303afbdcff5617cca. RELNOTES: None *** Reason for rollback *** PiperOrigin-RevId: 201686843 --- .../build/lib/cmdline/PackageIdentifier.java | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) (limited to 'src/main/java/com/google/devtools/build/lib/cmdline/PackageIdentifier.java') 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 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() { -- cgit v1.2.3