diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-01-20 14:07:13 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-01-20 14:10:13 -0400 |
| commit | 0c4e0046e72aab8216e3fe7d3f4252b1a66e1211 (patch) | |
| tree | b977261e78042cc6b11d530578a47a0d25d21359 /CmdLine.hs | |
| parent | b51672003cf035ba4595f45746cac343d154266f (diff) | |
make noMessages disable closing of json object in --json mode
This allows things like Command.Find to use noMessages and generate their
own complete json objects. Previouly, Command.Find managed that only via a
hack, which wasn't compatable with batch mode.
Only Command.Find, Command.Smudge, and Commange.Status use noMessages
currently, and none except for Command.Find are impacted by this change.
Fixes find --json --batch output
Diffstat (limited to 'CmdLine.hs')
| -rw-r--r-- | CmdLine.hs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/CmdLine.hs b/CmdLine.hs index e6ee0c2e6..bc0f86524 100644 --- a/CmdLine.hs +++ b/CmdLine.hs @@ -39,8 +39,10 @@ dispatch fuzzyok allargs allcmds globaloptions fields getgitrepo progname progde (cmd, seek, globalconfig) <- parsewith False cmdparser (\a -> inRepo $ a . Just) (liftIO . O.handleParseResult) - when (cmdnomessages cmd) $ + when (cmdnomessages cmd) $ do Annex.setOutput QuietOutput + Annex.changeState $ \s -> s + { Annex.output = (Annex.output s) { implicitMessages = False } } getParsed globalconfig whenM (annexDebug <$> Annex.getGitConfig) $ liftIO enableDebugOutput |