aquery: Add option to include/exclude the command line of actions.

RELNOTES: None PiperOrigin-RevId: 211810138
bazelbuild · Sep 6, 2018 · 2217614 · 2217614
1 parent 73eccc2
commit 2217614
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 13 deletions.
diff --git a/...in/java/com/google/devtools/build/lib/query2/ActionGraphProtoOutputFormatterCallback.java b/...in/java/com/google/devtools/build/lib/query2/ActionGraphProtoOutputFormatterCallback.java
@@ -38,8 +38,7 @@ public class ActionGraphProtoOutputFormatterCallback extends AqueryThreadsafeCal
       SkyframeExecutor skyframeExecutor,
       TargetAccessor<ConfiguredTargetValue> accessor) {
     super(reporter, options, out, skyframeExecutor, accessor);
-    // TODO(twerth): Allow users to include action command lines.
-    actionGraphDump = new ActionGraphDump(/* includeActionCmdLine */ false);
+    actionGraphDump = new ActionGraphDump(options.includeCommandline);
   }
 
   @Override

diff --git a/...ain/java/com/google/devtools/build/lib/query2/ActionGraphTextOutputFormatterCallback.java b/...ain/java/com/google/devtools/build/lib/query2/ActionGraphTextOutputFormatterCallback.java
@@ -144,17 +144,18 @@ private void writeAction(ActionAnalysisMetadata action, PrintStream printStream)
             .append("]\n");
       }
 
-      // TODO(twerth): Add option to only optionally include the command line.
-      stringBuilder
-          .append("  Command Line: ")
-          .append(
-              CommandFailureUtils.describeCommand(
-                  CommandDescriptionForm.COMPLETE,
-                  /* prettyPrintArgs= */ true,
-                  spawnAction.getArguments(),
-                  /* environment= */ null,
-                  /* cwd= */ null))
-          .append("\n");
+      if (options.includeCommandline) {
+        stringBuilder
+            .append("  Command Line: ")
+            .append(
+                CommandFailureUtils.describeCommand(
+                    CommandDescriptionForm.COMPLETE,
+                    /* prettyPrintArgs= */ true,
+                    spawnAction.getArguments(),
+                    /* environment= */ null,
+                    /* cwd= */ null))
+            .append("\n");
+      }
     }
 
     if (action instanceof ExecutionInfoSpecifier) {

diff --git a/src/main/java/com/google/devtools/build/lib/query2/output/AqueryOptions.java b/src/main/java/com/google/devtools/build/lib/query2/output/AqueryOptions.java
@@ -27,4 +27,12 @@ public class AqueryOptions extends CommonQueryOptions {
       effectTags = {OptionEffectTag.TERMINAL_OUTPUT},
       help = "The format in which the aquery results should be printed.")
   public String outputFormat;
+
+  @Option(
+      name = "include_commandline",
+      defaultValue = "true",
+      documentationCategory = OptionDocumentationCategory.QUERY,
+      effectTags = {OptionEffectTag.TERMINAL_OUTPUT},
+      help = "Includes the content of the action command lines in the output (potentially large).")
+  public boolean includeCommandline;
 }
diff --git a/src/test/shell/integration/aquery_test.sh b/src/test/shell/integration/aquery_test.sh
@@ -115,6 +115,11 @@ EOF
   else
     assert_contains "Command Line: (" output
   fi
+
+  assert_contains "echo unused" output
+  bazel aquery --noinclude_commandline "//$pkg:bar" > output \
+    2> "$TEST_log" || fail "Expected success"
+  assert_not_contains "echo unused" output
 }
 
 function test_aquery_skylark_env() {