diff options
| author | Joey Hess <joeyh@joeyh.name> | 2019-06-12 09:23:26 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2019-06-12 13:24:01 -0400 |
| commit | 8e5ea28c269ef4b2d8b6d4c3653db455abfed858 (patch) | |
| tree | fa41cf3a6d878bc2bec277e636ea1d6827018d20 /Messages.hs | |
| parent | 436f107715b71fe039d8c5fa627171c86f342b9c (diff) | |
finish CommandStart transition
The hoped for optimisation of CommandStart with -J did not materialize.
In fact, not runnign CommandStart in parallel is slower than -J3.
So, CommandStart are still run in parallel.
(The actual bad performance I've been seeing with -J in my big repo
has to do with building the remoteList.)
But, this is still progress toward making -J faster, because it gets rid
of the onlyActionOn roadblock in the way of making CommandCleanup jobs
run separate from CommandPerform jobs.
Added OnlyActionOn constructor for ActionItem which fixes the
onlyActionOn breakage in the last commit.
Made CustomOutput include an ActionItem, so even things using it can
specify OnlyActionOn.
In Command.Move and Command.Sync, there were CommandStarts that used
includeCommandAction, so output messages, which is no longer allowed.
Fixed by using startingCustomOutput, but that's still not quite right,
since it prevents message display for the includeCommandAction run
inside it too.
Diffstat (limited to 'Messages.hs')
| -rw-r--r-- | Messages.hs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Messages.hs b/Messages.hs index 87666b1372..94766048c9 100644 --- a/Messages.hs +++ b/Messages.hs @@ -92,6 +92,7 @@ showStartMessage (StartMessage command ai) = case ai of ActionItemFailedTransfer t _ -> showStartKey command (transferKey t) ai ActionItemWorkTreeFile file -> showStart command file ActionItemOther msg -> showStart' command msg + OnlyActionOn _ ai' -> showStartMessage (StartMessage command ai') showStartMessage (StartUsualMessages command ai) = do outputType <$> Annex.getState Annex.output >>= \case QuietOutput -> Annex.setOutput NormalOutput @@ -99,7 +100,7 @@ showStartMessage (StartUsualMessages command ai) = do Annex.changeState $ \s -> s { Annex.output = (Annex.output s) { implicitMessages = True } } showStartMessage (StartMessage command ai) -showStartMessage CustomOutput = do +showStartMessage (CustomOutput _) = do Annex.setOutput QuietOutput Annex.changeState $ \s -> s { Annex.output = (Annex.output s) { implicitMessages = False } } |