commit 34ec365f698c714ddb39b2a3b589dcb838cc4b9a
author felly <felly@google.com> Wed Jan 09 13:24:27 2019 -0800
committer Copybara-Service <copybara-piper@google.com> Wed Jan 09 13:26:28 2019 -0800
tree acb1a645e12e7144194446217971866ae299b7f3
parent d102a39be073aa675d67c43532b8d34a0aeacb46

Re-enable Fileset "output_file" lines in master log.

This is a partial rollback of https://github.com/bazelbuild/bazel/commit/2765ca4f2276dceb4568b511e7f187af8d3a23bf, which unintentionally removed the master_log output for Filesets.

RELNOTES: None
PiperOrigin-RevId: 228575878

src/main/java/com/google/devtools/build/lib/analysis/TargetCompleteEvent.java

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/TargetCompleteEvent.java b/src/main/java/com/google/devtools/build/lib/analysis/TargetCompleteEvent.java
index 9a8a3d3..3b2a531 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/TargetCompleteEvent.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/TargetCompleteEvent.java
@@ -248,10 +248,7 @@
     }
     return Iterables.filter(
         builder.build(),
-        (artifact) ->
-            !artifact.isSourceArtifact()
-                && !artifact.isMiddlemanArtifact()
-                && !artifact.isFileset());
+        (artifact) -> !artifact.isSourceArtifact() && !artifact.isMiddlemanArtifact());
   }
 
   @Override
@@ -312,17 +309,13 @@
     for (ArtifactsInOutputGroup group : outputs) {
       if (group.areImportant()) {
         for (Artifact artifact : group.getArtifacts()) {
-          if (!artifact.isFileset()) {
-            builder.add(new LocalFile(pathResolver.toPath(artifact), LocalFileType.OUTPUT));
-          }
+          builder.add(new LocalFile(pathResolver.toPath(artifact), LocalFileType.OUTPUT));
         }
       }
     }
     if (baselineCoverageArtifacts != null) {
       for (Artifact artifact : baselineCoverageArtifacts) {
-        if (!artifact.isFileset()) {
-          builder.add(new LocalFile(pathResolver.toPath(artifact), LocalFileType.OUTPUT));
-        }
+        builder.add(new LocalFile(pathResolver.toPath(artifact), LocalFileType.OUTPUT));
       }
     }
     return builder.build();

src/main/java/com/google/devtools/build/lib/runtime/NamedArtifactGroup.java

diff --git a/src/main/java/com/google/devtools/build/lib/runtime/NamedArtifactGroup.java b/src/main/java/com/google/devtools/build/lib/runtime/NamedArtifactGroup.java
index 05ee57c..2ec940d 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/NamedArtifactGroup.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/NamedArtifactGroup.java
@@ -61,7 +61,7 @@
     // This has to be consistent with the code below.
     ImmutableList.Builder<LocalFile> artifacts = ImmutableList.builder();
     for (Artifact artifact : view.directs()) {
-      if (artifact.isMiddlemanArtifact() || artifact.isFileset()) {
+      if (artifact.isMiddlemanArtifact()) {
         continue;
       }
       artifacts.add(new LocalFile(pathResolver.toPath(artifact), LocalFileType.OUTPUT));
@@ -78,7 +78,7 @@
         BuildEventStreamProtos.NamedSetOfFiles.newBuilder();
     for (Artifact artifact : view.directs()) {
       // We never want to report middleman artifacts. They are for internal use only.
-      if (artifact.isMiddlemanArtifact() || artifact.isFileset()) {
+      if (artifact.isMiddlemanArtifact()) {
         continue;
       }
       String name = artifact.getRootRelativePathString();