Skip to content

Commit

Permalink
Automated rollback of commit 7dec005.
Browse files Browse the repository at this point in the history
*** Reason for rollback ***

Tickled a hidden bug in Blaze query.

RELNOTES: None
PiperOrigin-RevId: 159718294
  • Loading branch information
aj-michael authored and philwo committed Jun 22, 2017
1 parent 71c6aa8 commit e9424cf
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 17 deletions.
5 changes: 0 additions & 5 deletions site/docs/query.html
Original file line number Diff line number Diff line change
Expand Up @@ -1224,11 +1224,6 @@ <h3 id="output-package">Print the set of packages</h3>
packages.
</p>

<p>
Packages in external repositories are formatted as
<code>@repo//foo/bar</code> while packages in the main repository are
formatted as <code>foo/bar</code>.
</p>
<p>
In conjunction with the <code>deps(...)</code> query, this output
option can be used to find the set of packages that must be checked
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ public OutputFormatterCallback<Target> createPostFactoStreamCallback(
public void processOutput(Iterable<Target> partialResult) {

for (Target target : partialResult) {
packageNames.add(target.getPackage().getPackageIdentifier().toString());
packageNames.add(target.getLabel().getPackageName());
}
}

Expand Down
11 changes: 0 additions & 11 deletions src/test/shell/bazel/local_repository_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -427,17 +427,6 @@ EOF
expect_log "//external:my_repo"
}

function test_repository_package_query() {
mkdir a b b/b
echo "local_repository(name='b', path='b')" > WORKSPACE
echo "sh_library(name='a', deps=['@b//b'])" > a/BUILD
touch b/WORKSPACE
echo "sh_library(name='b')" > b/b/BUILD
bazel query --output package "deps(//a)" >& $TEST_log || fail "query failed"
expect_log "a"
expect_log "@b//b"
}

function test_warning() {
local bar=$TEST_TMPDIR/bar
rm -rf "$bar"
Expand Down

0 comments on commit e9424cf

Please sign in to comment.