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.
This commit is contained in:
parent
a4dd8503b8
commit
c0c595345c
12 changed files with 58 additions and 50 deletions
13
Annex.hs
13
Annex.hs
|
@ -65,9 +65,6 @@ import Utility.Quvi (QuviVersion)
|
|||
#endif
|
||||
import Utility.InodeCache
|
||||
import Utility.Url
|
||||
#ifdef WITH_CONCURRENTOUTPUT
|
||||
import System.Console.Regions (ConsoleRegion)
|
||||
#endif
|
||||
|
||||
import "mtl" Control.Monad.Reader
|
||||
import Control.Concurrent
|
||||
|
@ -136,10 +133,7 @@ data AnnexState = AnnexState
|
|||
, existinghooks :: M.Map Git.Hook.Hook Bool
|
||||
, desktopnotify :: DesktopNotify
|
||||
, workers :: [Either AnnexState (Async AnnexState)]
|
||||
#ifdef WITH_CONCURRENTOUTPUT
|
||||
, consoleregion :: Maybe ConsoleRegion
|
||||
, consoleregionerrflag :: Bool
|
||||
#endif
|
||||
, concurrentjobs :: Maybe Int
|
||||
}
|
||||
|
||||
newState :: GitConfig -> Git.Repo -> AnnexState
|
||||
|
@ -184,10 +178,7 @@ newState c r = AnnexState
|
|||
, existinghooks = M.empty
|
||||
, desktopnotify = mempty
|
||||
, workers = []
|
||||
#ifdef WITH_CONCURRENTOUTPUT
|
||||
, consoleregion = Nothing
|
||||
, consoleregionerrflag = True
|
||||
#endif
|
||||
, concurrentjobs = Nothing
|
||||
}
|
||||
|
||||
{- Makes an Annex state object for the specified git repo.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue