Fix display when run with -J1
Commit b6642dde8a
broke it by enabling
non-concurrent display mode while leaving concurrency set in the config
and having already started concurrency earlier.
(I don't actually know if that commit was a good idea.)
Sponsored-By: Brett Eisenberg on Patreon
This commit is contained in:
parent
772d7fa82d
commit
114a2d7504
3 changed files with 9 additions and 5 deletions
|
@ -74,9 +74,7 @@ commandAction start = do
|
|||
st <- Annex.getState id
|
||||
case getConcurrency' (Annex.concurrency st) of
|
||||
NonConcurrent -> runnonconcurrent (Annex.sizelimit st)
|
||||
Concurrent n
|
||||
| n > 1 -> runconcurrent (Annex.sizelimit st) (Annex.workers st)
|
||||
| otherwise -> runnonconcurrent (Annex.sizelimit st)
|
||||
Concurrent _ -> runconcurrent (Annex.sizelimit st) (Annex.workers st)
|
||||
ConcurrentPerCpu -> runconcurrent (Annex.sizelimit st) (Annex.workers st)
|
||||
where
|
||||
runnonconcurrent sizelimit = start >>= \case
|
||||
|
@ -235,8 +233,11 @@ startConcurrency usedstages a = do
|
|||
let usegitcfg = setConcurrency (ConcurrencyGitConfig fromgitcfg)
|
||||
case (fromcmdline, fromgitcfg) of
|
||||
(NonConcurrent, NonConcurrent) -> a
|
||||
(Concurrent n, _) ->
|
||||
goconcurrent n
|
||||
(Concurrent n, _)
|
||||
| n > 1 -> goconcurrent n
|
||||
| otherwise -> do
|
||||
setConcurrency' NonConcurrent ConcurrencyCmdLine
|
||||
a
|
||||
(ConcurrentPerCpu, _) ->
|
||||
goconcurrentpercpu
|
||||
(NonConcurrent, Concurrent n) -> do
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue