diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-11-04 16:19:00 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-11-04 16:22:43 -0400 |
| commit | 332e98b6cb1091c46221e2d8579a0035ba4dff51 (patch) | |
| tree | 7c80c508ddf408951a6ffc0c419c84094736e781 /CmdLine.hs | |
| parent | 527b6970457e74f8c88dfdac7c96241e2496a2f2 (diff) | |
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.
Diffstat (limited to 'CmdLine.hs')
| -rw-r--r-- | CmdLine.hs | 6 |
1 files changed, 2 insertions, 4 deletions
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, |