1 files changed, 53 insertions, 61 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/CommonCommandOptions.java b/src/main/java/com/google/devtools/build/lib/runtime/CommonCommandOptions.java
index 2a88c32e98..b398aff727 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/CommonCommandOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/CommonCommandOptions.java
@@ -196,28 +196,26 @@ public class CommonCommandOptions extends OptionsBase {
   public boolean enableTracer;
 
   @Option(
-    name = "profile",
-    defaultValue = "null",
-    documentationCategory = OptionDocumentationCategory.LOGGING,
-    effectTags = {OptionEffectTag.AFFECTS_OUTPUTS, OptionEffectTag.BAZEL_MONITORING},
-    converter = OptionsUtils.PathFragmentConverter.class,
-    help =
-        "If set, profile Blaze and write data to the specified "
-            + "file. Use blaze analyze-profile to analyze the profile."
-  )
+      name = "profile",
+      defaultValue = "null",
+      documentationCategory = OptionDocumentationCategory.LOGGING,
+      effectTags = {OptionEffectTag.AFFECTS_OUTPUTS, OptionEffectTag.BAZEL_MONITORING},
+      converter = OptionsUtils.PathFragmentConverter.class,
+      help =
+          "If set, profile Bazel and write data to the specified "
+              + "file. Use bazel analyze-profile to analyze the profile.")
   public PathFragment profilePath;
 
   @Option(
-    name = "record_full_profiler_data",
-    defaultValue = "false",
-    documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
-    effectTags = {OptionEffectTag.AFFECTS_OUTPUTS, OptionEffectTag.BAZEL_MONITORING},
-    help =
-        "By default, Blaze profiler will record only aggregated data for fast but numerous "
-            + "events (such as statting the file). If this option is enabled, profiler will record "
-            + "each event - resulting in more precise profiling data but LARGE performance "
-            + "hit. Option only has effect if --profile used as well."
-  )
+      name = "record_full_profiler_data",
+      defaultValue = "false",
+      documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
+      effectTags = {OptionEffectTag.AFFECTS_OUTPUTS, OptionEffectTag.BAZEL_MONITORING},
+      help =
+          "By default, Bazel profiler will record only aggregated data for fast but numerous "
+              + "events (such as statting the file). If this option is enabled, profiler will "
+              + "record each event - resulting in more precise profiling data but LARGE "
+              + "performance hit. Option only has effect if --profile used as well.")
   public boolean recordFullProfilerData;
 
   @Option(
@@ -246,53 +244,48 @@ public class CommonCommandOptions extends OptionsBase {
   public MemoryProfileStableHeapParameters memoryProfileStableHeapParameters;
 
   @Option(
-    name = "experimental_oom_more_eagerly_threshold",
-    defaultValue = "100",
-    documentationCategory = OptionDocumentationCategory.EXECUTION_STRATEGY,
-    effectTags = {OptionEffectTag.HOST_MACHINE_RESOURCE_OPTIMIZATIONS},
-    help =
-        "If this flag is set to a value less than 100, Blaze will OOM if, after two full GC's, more"
-            + "than this percentage of the (old gen) heap is still occupied."
-  )
+      name = "experimental_oom_more_eagerly_threshold",
+      defaultValue = "100",
+      documentationCategory = OptionDocumentationCategory.EXECUTION_STRATEGY,
+      effectTags = {OptionEffectTag.HOST_MACHINE_RESOURCE_OPTIMIZATIONS},
+      help =
+          "If this flag is set to a value less than 100, Bazel will OOM if, after two full GC's, "
+              + "more than this percentage of the (old gen) heap is still occupied.")
   public int oomMoreEagerlyThreshold;
 
   @Option(
-    name = "startup_time",
-    defaultValue = "0",
-    documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
-    effectTags = {OptionEffectTag.AFFECTS_OUTPUTS, OptionEffectTag.BAZEL_MONITORING},
-    metadataTags = {OptionMetadataTag.HIDDEN},
-    help = "The time in ms the launcher spends before sending the request to the blaze server."
-  )
+      name = "startup_time",
+      defaultValue = "0",
+      documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
+      effectTags = {OptionEffectTag.AFFECTS_OUTPUTS, OptionEffectTag.BAZEL_MONITORING},
+      metadataTags = {OptionMetadataTag.HIDDEN},
+      help = "The time in ms the launcher spends before sending the request to the bazel server.")
   public long startupTime;
 
   @Option(
-    name = "extract_data_time",
-    defaultValue = "0",
-    documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
-    effectTags = {OptionEffectTag.AFFECTS_OUTPUTS, OptionEffectTag.BAZEL_MONITORING},
-    metadataTags = {OptionMetadataTag.HIDDEN},
-    help = "The time in ms spent on extracting the new blaze version."
-  )
+      name = "extract_data_time",
+      defaultValue = "0",
+      documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
+      effectTags = {OptionEffectTag.AFFECTS_OUTPUTS, OptionEffectTag.BAZEL_MONITORING},
+      metadataTags = {OptionMetadataTag.HIDDEN},
+      help = "The time in ms spent on extracting the new bazel version.")
   public long extractDataTime;
 
   @Option(
-    name = "command_wait_time",
-    defaultValue = "0",
-    documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
-    effectTags = {OptionEffectTag.AFFECTS_OUTPUTS, OptionEffectTag.BAZEL_MONITORING},
-    metadataTags = {OptionMetadataTag.HIDDEN},
-    help = "The time in ms a command had to wait on a busy Blaze server process."
-  )
+      name = "command_wait_time",
+      defaultValue = "0",
+      documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
+      effectTags = {OptionEffectTag.AFFECTS_OUTPUTS, OptionEffectTag.BAZEL_MONITORING},
+      metadataTags = {OptionMetadataTag.HIDDEN},
+      help = "The time in ms a command had to wait on a busy Bazel server process.")
   public long waitTime;
 
   @Option(
-    name = "tool_tag",
-    defaultValue = "",
-    documentationCategory = OptionDocumentationCategory.LOGGING,
-    effectTags = {OptionEffectTag.AFFECTS_OUTPUTS, OptionEffectTag.BAZEL_MONITORING},
-    help = "A tool name to attribute this Blaze invocation to."
-  )
+      name = "tool_tag",
+      defaultValue = "",
+      documentationCategory = OptionDocumentationCategory.LOGGING,
+      effectTags = {OptionEffectTag.AFFECTS_OUTPUTS, OptionEffectTag.BAZEL_MONITORING},
+      help = "A tool name to attribute this Bazel invocation to.")
   public String toolTag;
 
   @Option(
@@ -306,13 +299,12 @@ public class CommonCommandOptions extends OptionsBase {
   public String restartReason;
 
   @Option(
-    name = "binary_path",
-    defaultValue = "",
-    documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
-    effectTags = {OptionEffectTag.AFFECTS_OUTPUTS, OptionEffectTag.BAZEL_MONITORING},
-    metadataTags = {OptionMetadataTag.HIDDEN},
-    help = "The absolute path of the blaze binary."
-  )
+      name = "binary_path",
+      defaultValue = "",
+      documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
+      effectTags = {OptionEffectTag.AFFECTS_OUTPUTS, OptionEffectTag.BAZEL_MONITORING},
+      metadataTags = {OptionMetadataTag.HIDDEN},
+      help = "The absolute path of the bazel binary.")
   public String binaryPath;
 
   @Option(