From 1933f8a5599f33b95811710ad10e1ed17703699d Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Wed, 4 Nov 2015 13:45:34 -0400
Subject: concurrent-output, first pass

Output without -Jn should be unchanged from before. With -Jn,
concurrent-output is used for messages, but regions are not used yet, so
it's a mess.
---
 CmdLine.hs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'CmdLine.hs')

diff --git a/CmdLine.hs b/CmdLine.hs
index e6ee0c2e6..073d4b32d 100644
--- a/CmdLine.hs
+++ b/CmdLine.hs
@@ -24,6 +24,7 @@ import Annex.Action
 import Annex.Environment
 import Command
 import Types.Messages
+import Messages.Concurrent
 
 {- Runs the passed command line. -}
 dispatch :: Bool -> CmdParams -> [Command] -> [GlobalOption] -> [(String, String)] -> IO Git.Repo -> String -> String -> IO ()
@@ -45,8 +46,9 @@ dispatch fuzzyok allargs allcmds globaloptions fields getgitrepo progname progde
 			whenM (annexDebug <$> Annex.getGitConfig) $
 				liftIO enableDebugOutput
 			startup
-			performCommandAction cmd seek $
-				shutdown $ cmdnocommit cmd
+			withConcurrentOutput $
+				performCommandAction cmd seek $
+					shutdown $ cmdnocommit cmd
 	go (Left norepo) = do
 		let ingitrepo = \a -> a =<< Git.Config.global
 		-- Parse command line with full cmdparser first,
-- 
cgit v1.2.3