aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main
diff options
context:
space:
mode:
authorGravatar Klaus Aehlig <aehlig@google.com>2016-06-27 15:15:52 +0000
committerGravatar Dmitry Lomov <dslomov@google.com>2016-06-27 17:06:55 +0000
commit6c07f6218d436912efc165a7074f82e1f1887cb9 (patch)
tree8a67b717dd03a6c9c787cc727e9633dd91294843 /src/main
parentd8d7d2385a3b0fe0f976ac99954b1f079e07f6f4 (diff)
Unhide --experimental_ui_actions_shown
-- Change-Id: I1b8acc9dbd73ede3952a51f3f67b32e1b7e536a2 Reviewed-on: https://bazel-review.googlesource.com/#/c/3900 MOS_MIGRATED_REVID=125957281
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandEventHandler.java8
-rw-r--r--src/main/java/com/google/devtools/build/lib/runtime/ExperimentalStateTracker.java6
2 files changed, 11 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandEventHandler.java b/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandEventHandler.java
index 8ef6dbea1e..f322394f66 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandEventHandler.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandEventHandler.java
@@ -160,8 +160,12 @@ public class BlazeCommandEventHandler implements EventHandler {
@Option(
name = "experimental_ui_actions_shown",
defaultValue = "3",
- category = "hidden",
- help = "Number of concurrent actions shown in the experimental new Bazel UI."
+ category = "verbosity",
+ help =
+ "Number of concurrent actions shown in the alternative progress bar; each "
+ + "action is shown on a separate line. The alternative progress bar always shows "
+ + "at least one one, all numbers less than 1 are mapped to 1. "
+ + "This option has no effect unless --experimental_ui is set."
)
public int experimentalUiActionsShown;
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/ExperimentalStateTracker.java b/src/main/java/com/google/devtools/build/lib/runtime/ExperimentalStateTracker.java
index 2661243a27..03e894100b 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/ExperimentalStateTracker.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/ExperimentalStateTracker.java
@@ -106,7 +106,11 @@ class ExperimentalStateTracker {
* Set the maximal number of actions shown in the progress bar.
*/
void setSampleSize(int sampleSize) {
- this.sampleSize = sampleSize;
+ if (sampleSize >= 1) {
+ this.sampleSize = sampleSize;
+ } else {
+ this.sampleSize = 1;
+ }
}
void buildStarted(BuildStartingEvent event) {