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/Action.hs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'CmdLine/Action.hs')

diff --git a/CmdLine/Action.hs b/CmdLine/Action.hs
index eeb41394a..73cffec76 100644
--- a/CmdLine/Action.hs
+++ b/CmdLine/Action.hs
@@ -56,7 +56,8 @@ commandAction a = withOutputType go
 			else do
 				l <- liftIO $ drainTo (n-1) ws
 				findFreeSlot l
-		w <- liftIO $ async $ snd <$> Annex.run st run
+		w <- liftIO $ async
+			$ snd <$> Annex.run st (inOwnConsoleRegion run)
 		Annex.changeState $ \s -> s { Annex.workers = Right w:ws' }
 	go _  =	run
 	run = void $ includeCommandAction a
-- 
cgit v1.2.3