commit 52ac35666a61d72c7fb105a6deca619af813e568
author Damien Martin-Guillerez <dmarting@google.com> Wed Feb 25 18:55:53 2015 +0000
committer Han-Wen Nienhuys <hanwen@google.com> Wed Feb 25 18:55:53 2015 +0000
tree cce578538d397c09a5d430f328dffc6bcd0f2353
parent 2a04620c4903b987d7f87726e75f1d784547fa96

Enforce same behavior for //path/to/package and path/to/package

Having an error message in path/to/package and //path/to/package resolve to //path/to/package:package was a bit strange.

--
MOS_MIGRATED_REVID=87171051

src/main/java/com/google/devtools/build/lib/cmdline/TargetPattern.java

diff --git a/src/main/java/com/google/devtools/build/lib/cmdline/TargetPattern.java b/src/main/java/com/google/devtools/build/lib/cmdline/TargetPattern.java
index 6677970..caca634 100644
--- a/src/main/java/com/google/devtools/build/lib/cmdline/TargetPattern.java
+++ b/src/main/java/com/google/devtools/build/lib/cmdline/TargetPattern.java
@@ -151,12 +151,8 @@
         throws TargetParsingException, InterruptedException,
         TargetPatternResolver.MissingDepException {
       if (resolver.isPackage(path)) {
-        // User has specified a package name.  Issue a helpful error message.
-        throw new TargetParsingException("ambiguous target pattern: '" + path + "' is "
-            + "the name of a package; use '" + path + ":all' to mean \"all "
-            + "rules in this package\", '" + path + "/...' to mean \"all rules recursively "
-            + "beneath this package\", or '//" + path + "' to mean \"the default rule in this "
-            + "package\"");
+        // User has specified a package name. lookout for default target.
+        return resolver.getExplicitTarget("//" + path);
       }
 
       List<String> pieces = SLASH_SPLITTER.splitToList(path);
@@ -405,14 +401,11 @@
       // sufficient to test the first segment. This is really a rather weak check; perhaps we should
       // just eliminate it.
       int slashIndex = pattern.indexOf('/');
-      if (slashIndex < 0) {
-        throw new TargetParsingException("ambiguous target pattern: '" + pattern + "' could "
-            + "potentially be the name of a package; use '" + pattern + ":all' to mean \"all "
-            + "rules in this package\", '" + pattern + "/...' to mean \"all rules recursively "
-            + "beneath this package\", or '//" + pattern + "' to mean \"the default rule in this "
-            + "package\"");
+      String packageName = pattern;
+      if (slashIndex > 0) {
+        packageName = pattern.substring(0, slashIndex);
       }
-      String errorMessage = LabelValidator.validatePackageName(pattern.substring(0, slashIndex));
+      String errorMessage = LabelValidator.validatePackageName(packageName);
       if (errorMessage != null) {
         throw new TargetParsingException("Bad target pattern '" + originalPattern + "': " +
             errorMessage);