From 332e98b6cb1091c46221e2d8579a0035ba4dff51 Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Wed, 4 Nov 2015 16:19:00 -0400
Subject: 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.
---
 CmdLine.hs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'CmdLine.hs')

diff --git a/CmdLine.hs b/CmdLine.hs
index 880f9de09..e6ee0c2e6 100644
--- a/CmdLine.hs
+++ b/CmdLine.hs
@@ -24,7 +24,6 @@ import Annex.Action
 import Annex.Environment
 import Command
 import Types.Messages
-import Messages.Internal
 
 {- Runs the passed command line. -}
 dispatch :: Bool -> CmdParams -> [Command] -> [GlobalOption] -> [(String, String)] -> IO Git.Repo -> String -> String -> IO ()
@@ -46,9 +45,8 @@ dispatch fuzzyok allargs allcmds globaloptions fields getgitrepo progname progde
 			whenM (annexDebug <$> Annex.getGitConfig) $
 				liftIO enableDebugOutput
 			startup
-			withConcurrentOutput $
-				performCommandAction cmd seek $
-					shutdown $ cmdnocommit cmd
+			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