From 8879c96d157f06bbd2372064251676b7927ce38e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 8 Jul 2015 13:39:11 -0400 Subject: display cmdparamdesc in optparse-applicative usage messages Since optparse-applicative display "FOO" as "[FOO]", the paramOptional modifier which wrapped it in square brackets was removed from most places. --- Command/Help.hs | 2 +- Command/Info.hs | 2 +- Command/ReKey.hs | 2 +- Command/Sync.hs | 2 +- Command/VPop.hs | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'Command') diff --git a/Command/Help.hs b/Command/Help.hs index 073ab2b36..b6b1be379 100644 --- a/Command/Help.hs +++ b/Command/Help.hs @@ -23,7 +23,7 @@ import System.Console.GetOpt cmd :: Command cmd = noCommit $ noRepo startNoRepo $ dontCheck repoExists $ - command "help" (paramOptional "COMMAND") seek SectionCommon "display help" + command "help" "COMMAND" seek SectionCommon "display help" seek :: CommandSeek seek = withWords start diff --git a/Command/Info.hs b/Command/Info.hs index 802aabb56..0c8200ff3 100644 --- a/Command/Info.hs +++ b/Command/Info.hs @@ -80,7 +80,7 @@ type StatState = StateT StatInfo Annex cmd :: Command cmd = noCommit $ dontCheck repoExists $ withOptions (jsonOption : bytesOption : annexedMatchingOptions) $ - command "info" (paramOptional $ paramRepeating paramItem) seek SectionQuery + command "info" (paramRepeating paramItem) seek SectionQuery "shows information about the specified item or the repository as a whole" seek :: CommandSeek diff --git a/Command/ReKey.hs b/Command/ReKey.hs index 319f3eda8..2a2787898 100644 --- a/Command/ReKey.hs +++ b/Command/ReKey.hs @@ -20,7 +20,7 @@ import qualified Remote cmd :: Command cmd = notDirect $ command "rekey" - (paramOptional $ paramRepeating $ paramPair paramPath paramKey) + (paramRepeating $ paramPair paramPath paramKey) seek SectionPlumbing "change keys used for files" seek :: CommandSeek diff --git a/Command/Sync.hs b/Command/Sync.hs index 10b9fc2cd..95bd7c8d7 100644 --- a/Command/Sync.hs +++ b/Command/Sync.hs @@ -53,7 +53,7 @@ import qualified Data.Map as M cmd :: Command cmd = withOptions syncOptions $ - command "sync" (paramOptional (paramRepeating paramRemote)) + command "sync" (paramRepeating paramRemote) seek SectionCommon "synchronize local repository with remotes" syncOptions :: [Option] diff --git a/Command/VPop.hs b/Command/VPop.hs index f6fc56b08..0dadd52fb 100644 --- a/Command/VPop.hs +++ b/Command/VPop.hs @@ -18,7 +18,7 @@ import Command.View (checkoutViewBranch) cmd :: Command cmd = notBareRepo $ notDirect $ - command "vpop" (paramOptional paramNumber) seek SectionMetaData + command "vpop" paramNumber seek SectionMetaData "switch back to previous view" seek :: CommandSeek -- cgit v1.2.3