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 /Messages/Progress.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 'Messages/Progress.hs')
| -rw-r--r-- | Messages/Progress.hs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Messages/Progress.hs b/Messages/Progress.hs index a20ba098e..89f2f0c8c 100644 --- a/Messages/Progress.hs +++ b/Messages/Progress.hs @@ -65,10 +65,7 @@ metered combinemeterupdate key af a = case keySize key of return r #else -- Old progress bar code, not suitable for concurrent output. - go _ (ConcurrentOutput _) = do - r <- nometer - liftIO $ putStrLn $ fromMaybe (key2file key) af - return r + go _ (ConcurrentOutput _) = nometer go size NormalOutput = do showOutput progress <- liftIO $ newProgress "" size |