mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

differentiate between concurrency enabled at command line and by git config

Browse source 
The latter should not affect --batch mode.
This commit is contained in:
Joey Hess 2020-09-16 11:41:28 -04:00
parent 8471df3b6d
commit 77c42782d0
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
9 changed files with 46 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Annex/Ssh.hs
View file

@ -34,6 +34,7 @@ import Annex.Path
import Utility.Env
import Utility.Hash
import Types.CleanupActions
import Annex.Concurrent.Utility
import Types.Concurrency
import Git.Env
import Git.Ssh
@ -107,7 +108,7 @@ sshCachingInfo (host, port) = go =<< sshCacheDir'
-- No connection caching with concurrency is not a good
-- combination, so warn the user.
go (Left whynocaching) = do
Annex.getState Annex.concurrency >>= \case
getConcurrency >>= \case
NonConcurrent -> return ()
Concurrent {} -> warnnocaching whynocaching
ConcurrentPerCpu -> warnnocaching whynocaching
@ -229,7 +230,7 @@ prepSocket socketfile sshhost sshparams = do
let socketlock = socket2lock socketfile
Annex.getState Annex.concurrency >>= \case
getConcurrency >>= \case
NonConcurrent -> return ()
Concurrent {} -> makeconnection socketlock
ConcurrentPerCpu -> makeconnection socketlock