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 /Types | |
| 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 'Types')
| -rw-r--r-- | Types/Command.hs | 2 | ||||
| -rw-r--r-- | Types/Messages.hs | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Types/Command.hs b/Types/Command.hs index e12873850..aa22143dd 100644 --- a/Types/Command.hs +++ b/Types/Command.hs @@ -40,7 +40,7 @@ type CommandCleanup = Annex Bool data Command = Command { cmdcheck :: [CommandCheck] -- check stage , cmdnocommit :: Bool -- don't commit journalled state changes - , cmdnomessages :: Bool -- don't output normal messages + , cmdnomessages :: Bool -- don't output normal messages , cmdname :: String , cmdparamdesc :: CmdParamsDesc -- description of params for usage , cmdsection :: CommandSection diff --git a/Types/Messages.hs b/Types/Messages.hs index e8dbb8e89..f9e09ecd7 100644 --- a/Types/Messages.hs +++ b/Types/Messages.hs @@ -24,6 +24,7 @@ data SideActionBlock = NoBlock | StartBlock | InBlock data MessageState = MessageState { outputType :: OutputType , sideActionBlock :: SideActionBlock + , implicitMessages :: Bool #ifdef WITH_CONCURRENTOUTPUT , consoleRegion :: Maybe ConsoleRegion , consoleRegionErrFlag :: Bool @@ -35,6 +36,7 @@ instance Default MessageState def = MessageState { outputType = NormalOutput , sideActionBlock = NoBlock + , implicitMessages = True #ifdef WITH_CONCURRENTOUTPUT , consoleRegion = Nothing , consoleRegionErrFlag = False |