The file matching options are now only accepted by commands that can actually use them.
This commit is contained in:
parent
52424dc382
commit
8066a1c3cc
24 changed files with 118 additions and 77 deletions
|
@ -7,7 +7,6 @@
|
|||
|
||||
module CmdLine.Option (
|
||||
commonOptions,
|
||||
matcherOptions,
|
||||
flagOption,
|
||||
fieldOption,
|
||||
optionName,
|
||||
|
@ -21,9 +20,9 @@ import Common.Annex
|
|||
import qualified Annex
|
||||
import Types.Messages
|
||||
import Types.DesktopNotify
|
||||
import Limit
|
||||
import CmdLine.Usage
|
||||
|
||||
-- Options accepted by both git-annex and git-annex-shell sub-commands.
|
||||
commonOptions :: [Option]
|
||||
commonOptions =
|
||||
[ Option [] ["force"] (NoArg (setforce True))
|
||||
|
@ -56,18 +55,6 @@ commonOptions =
|
|||
unsetdebug = Annex.changeGitConfig $ \c -> c { annexDebug = False }
|
||||
setdesktopnotify v = Annex.changeState $ \s -> s { Annex.desktopnotify = Annex.desktopnotify s <> v }
|
||||
|
||||
matcherOptions :: [Option]
|
||||
matcherOptions =
|
||||
[ longopt "not" "negate next option"
|
||||
, longopt "and" "both previous and next option must match"
|
||||
, longopt "or" "either previous or next option must match"
|
||||
, shortopt "(" "open group of options"
|
||||
, shortopt ")" "close group of options"
|
||||
]
|
||||
where
|
||||
longopt o = Option [] [o] $ NoArg $ addToken o
|
||||
shortopt o = Option o [] $ NoArg $ addToken o
|
||||
|
||||
{- An option that sets a flag. -}
|
||||
flagOption :: String -> String -> String -> Option
|
||||
flagOption short opt description =
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue