From 44e46b836a580c2fe3e96f39f4c6e02516ca4a0b Mon Sep 17 00:00:00 2001
From: leba <leba@google.com>
Date: Tue, 12 Jan 2021 00:28:29 -0800
Subject: [PATCH] Make --include_aspect the default behavior for aquery.

From various user feedbacks, we've found that more often than not, aspect-generated actions should be included in the final result.

RELNOTES: None
PiperOrigin-RevId: 351315949
---
 site/docs/aquery.html                                           | 2 +-
 .../devtools/build/lib/query2/common/CommonQueryOptions.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/site/docs/aquery.html b/site/docs/aquery.html
index bb35cd56a7eb0f..a45f9b02dda954 100644
--- a/site/docs/aquery.html
+++ b/site/docs/aquery.html
@@ -155,7 +155,7 @@ <h4><code class='flag'>--include_artifacts, default=true</code></h4>
   Includes names of the action inputs and outputs in the output (potentially large).
 </p>
 
-<h4><code class='flag'>--include_aspects, default=false</code></h4>
+<h4><code class='flag'>--include_aspects, default=true</code></h4>
 
 <p>
   Whether to include Aspect-generated actions in the output.
diff --git a/src/main/java/com/google/devtools/build/lib/query2/common/CommonQueryOptions.java b/src/main/java/com/google/devtools/build/lib/query2/common/CommonQueryOptions.java
index 63111a36162eea..27c0108d64ad41 100644
--- a/src/main/java/com/google/devtools/build/lib/query2/common/CommonQueryOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/query2/common/CommonQueryOptions.java
@@ -128,7 +128,7 @@ public String getLineTerminator() {
 
   @Option(
       name = "include_aspects",
-      defaultValue = "false",
+      defaultValue = "true",
       documentationCategory = OptionDocumentationCategory.QUERY,
       effectTags = {OptionEffectTag.TERMINAL_OUTPUT},
       help =