diff options
| author |  Han-Wen Nienhuys <hanwen@google.com> | 2016-01-19 16:21:57 +0000 |
|---|---|---|
| committer | Han-Wen Nienhuys <hanwen@google.com> | 2016-01-20 11:33:52 +0000 |
| commit | d03f32142ca0e05cc87855337557f8ea33972658 (patch) | |
| tree | c96bdbf6afb5c4dfbb28ec024b4da73d6aeaee71 /src/main/java/com/google/devtools/build/lib/runtime | |
| parent | 4bdbf338814e38b2fb5ff7033eb4d98c8e0798ff (diff) | |
Replace %{product} in option help texts too.
Fixes #730.
--
MOS_MIGRATED_REVID=112475309
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/runtime')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandUtils.java | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandUtils.java b/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandUtils.java index 3f14471ac5..3ba6e22ef9 100644 --- a/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandUtils.java +++ b/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandUtils.java @@ -131,15 +131,19 @@ public class BlazeCommandUtils { throw new IllegalStateException("Help template for '" + topic + "' omits %{options}!"); } - return template. - replace("%{product}", Constants.PRODUCT_NAME). - replace("%{command}", topic). - replace("%{options}", parser.describeOptions(categoryDescriptions, helpVerbosity)). - trim() + String optionStr = + parser + .describeOptions(categoryDescriptions, helpVerbosity) + .replace("%{product}", Constants.PRODUCT_NAME); + return template + .replace("%{product}", Constants.PRODUCT_NAME) + .replace("%{command}", topic) + .replace("%{options}", optionStr) + .trim() + "\n\n" + (helpVerbosity == OptionsParser.HelpVerbosity.MEDIUM - ? "(Use 'help --long' for full details or --short to just enumerate options.)\n" - : ""); + ? "(Use 'help --long' for full details or --short to just enumerate options.)\n" + : ""); } /** |