aboutsummaryrefslogtreecommitdiff
path: root/Annex.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-11-04 14:52:07 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-11-04 14:52:07 -0400
commit527b6970457e74f8c88dfdac7c96241e2496a2f2 (patch)
treefdf6e4b273cc5043dd8e009675ba78f98659a514 /Annex.hs
parent1933f8a5599f33b95811710ad10e1ed17703699d (diff)
add regions to concurrent output
still no progress displays when getting files etc, but a big improvement
Diffstat (limited to 'Annex.hs')
-rw-r--r--Annex.hs11
1 files changed, 11 insertions, 0 deletions
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.