diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-11-04 16:19:00 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-11-04 16:22:43 -0400 |
| commit | 332e98b6cb1091c46221e2d8579a0035ba4dff51 (patch) | |
| tree | 7c80c508ddf408951a6ffc0c419c84094736e781 /Types/Messages.hs | |
| parent | 527b6970457e74f8c88dfdac7c96241e2496a2f2 (diff) | |
arrange for regional output manager to run when -J is enabled
Commands that want to use it have to run their seek action inside
allowConcurrentOutput. Which seems reasonable; perhaps some future command
will want to support the -J flag but not use regions.
The region state moved from Annex to MessageState. This makes sense
organizationally, and note that some uses of onLocal use a different Annex
state, but pass the MessageState into it, which is what is needed.
Diffstat (limited to 'Types/Messages.hs')
| -rw-r--r-- | Types/Messages.hs | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/Types/Messages.hs b/Types/Messages.hs index 5cbb53057..0e60f36c8 100644 --- a/Types/Messages.hs +++ b/Types/Messages.hs @@ -5,11 +5,18 @@ - Licensed under the GNU GPL version 3 or higher. -} +{-# LANGUAGE CPP #-} + module Types.Messages where import Data.Default +#ifdef WITH_CONCURRENTOUTPUT +import System.Console.Regions (ConsoleRegion) +#endif + data OutputType = NormalOutput | QuietOutput | ConcurrentOutput Int | JSONOutput + deriving (Show) data SideActionBlock = NoBlock | StartBlock | InBlock deriving (Eq) @@ -17,8 +24,10 @@ data SideActionBlock = NoBlock | StartBlock | InBlock data MessageState = MessageState { outputType :: OutputType , sideActionBlock :: SideActionBlock + , consoleRegion :: Maybe ConsoleRegion + , consoleRegionErrFlag :: Bool } instance Default MessageState where - def = MessageState NormalOutput NoBlock + def = MessageState NormalOutput NoBlock Nothing False |