diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-07-10 12:47:35 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-07-10 12:47:35 -0400 |
| commit | 9886c302ef538e538ec7d48b94374b9d2400004f (patch) | |
| tree | 4c6b55c2ab31a977f1fbd89f131aac9ae3722119 /CmdLine | |
| parent | bc9b0307cf427ab8ca6532c2ae4e0086e7ad4a4a (diff) | |
implement withGlobalOptions, and convert Find
Diffstat (limited to 'CmdLine')
| -rw-r--r-- | CmdLine/GitAnnex.hs | 4 | ||||
| -rw-r--r-- | CmdLine/GitAnnex/Options.hs | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/CmdLine/GitAnnex.hs b/CmdLine/GitAnnex.hs index 32a4b8b10..d2411ffb4 100644 --- a/CmdLine/GitAnnex.hs +++ b/CmdLine/GitAnnex.hs @@ -56,7 +56,7 @@ import qualified Command.AddUnused import qualified Command.Unlock import qualified Command.Lock import qualified Command.PreCommit ---import qualified Command.Find +import qualified Command.Find --import qualified Command.FindRef --import qualified Command.Whereis --import qualified Command.List @@ -183,7 +183,7 @@ cmds = -- , Command.Unused.cmd -- , Command.DropUnused.cmd , Command.AddUnused.cmd --- , Command.Find.cmd + , Command.Find.cmd -- , Command.FindRef.cmd -- , Command.Whereis.cmd -- , Command.List.cmd diff --git a/CmdLine/GitAnnex/Options.hs b/CmdLine/GitAnnex/Options.hs index 6965e8e51..9f033aa4d 100644 --- a/CmdLine/GitAnnex/Options.hs +++ b/CmdLine/GitAnnex/Options.hs @@ -200,8 +200,8 @@ fileMatchingOptions' = "match files smaller than a size" ] -parseCombiningOptions :: Parser [GlobalSetter] -parseCombiningOptions = +combiningOptions :: Parser [GlobalSetter] +combiningOptions = many $ longopt "not" "negate next option" <|> longopt "and" "both previous and next option must match" <|> longopt "or" "either previous or next option must match" @@ -211,8 +211,8 @@ parseCombiningOptions = longopt o h = globalFlag (Limit.addToken o) ( long o <> help h ) shortopt o h = globalFlag (Limit.addToken [o]) ( short o <> help h) -parseJsonOption :: Parser GlobalSetter -parseJsonOption = globalFlag (Annex.setOutput JSONOutput) +jsonOption :: Parser GlobalSetter +jsonOption = globalFlag (Annex.setOutput JSONOutput) ( long "json" <> short 'j' <> help "enable JSON output" ) |