From 527b6970457e74f8c88dfdac7c96241e2496a2f2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 4 Nov 2015 14:52:07 -0400 Subject: add regions to concurrent output still no progress displays when getting files etc, but a big improvement --- Annex.hs | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'Annex.hs') diff --git a/Annex.hs b/Annex.hs index d6834e24a..47147b358 100644 --- a/Annex.hs +++ b/Annex.hs @@ -65,6 +65,9 @@ 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 @@ -133,6 +136,10 @@ 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 } newState :: GitConfig -> Git.Repo -> AnnexState @@ -177,6 +184,10 @@ newState c r = AnnexState , existinghooks = M.empty , desktopnotify = mempty , workers = [] +#ifdef WITH_CONCURRENTOUTPUT + , consoleregion = Nothing + , consoleregionerrflag = True +#endif } {- Makes an Annex state object for the specified git repo. -- cgit v1.2.3