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 /Annex.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 'Annex.hs')
| -rw-r--r-- | Annex.hs | 13 |
1 files changed, 2 insertions, 11 deletions
@@ -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. |