differentiate between concurrency enabled at command line and by git config
The latter should not affect --batch mode.
This commit is contained in:
parent
8471df3b6d
commit
77c42782d0
9 changed files with 46 additions and 21 deletions
|
@ -68,6 +68,7 @@ import Types.Command (StartMessage(..), SeekInput)
|
|||
import Types.Transfer (transferKey)
|
||||
import Messages.Internal
|
||||
import Messages.Concurrent
|
||||
import Annex.Concurrent.Utility
|
||||
import qualified Messages.JSON as JSON
|
||||
import qualified Annex
|
||||
|
||||
|
@ -298,7 +299,7 @@ prompt a = do
|
|||
|
||||
{- Like prompt, but for a non-annex action that prompts. -}
|
||||
mkPrompter :: (MonadMask m, MonadIO m) => Annex (m a -> m a)
|
||||
mkPrompter = Annex.getState Annex.concurrency >>= \case
|
||||
mkPrompter = getConcurrency >>= \case
|
||||
NonConcurrent -> return id
|
||||
(Concurrent _) -> goconcurrent
|
||||
ConcurrentPerCpu -> goconcurrent
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue