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.
This commit is contained in:
parent
436f107715
commit
8e5ea28c26
26 changed files with 142 additions and 97 deletions
|
@ -41,14 +41,21 @@ type CommandCleanup = Annex Bool
|
|||
{- Message that is displayed when starting to perform an action on
|
||||
- something. The String is typically the name of the command or action
|
||||
- being performed.
|
||||
-
|
||||
- CustomOutput prevents any start, end, or other implicit messages from
|
||||
- being displayed, letting a command output its own custom format.
|
||||
-}
|
||||
data StartMessage
|
||||
= StartMessage String ActionItem
|
||||
| StartUsualMessages String ActionItem
|
||||
| CustomOutput
|
||||
-- ^ Like StartMessage, but makes sure to enable usual message
|
||||
-- display in case it was disabled by cmdnomessages.
|
||||
| CustomOutput ActionItem
|
||||
-- ^ Prevents any start, end, or other implicit messages from
|
||||
-- being displayed, letting a command output its own custom format.
|
||||
deriving (Show)
|
||||
|
||||
instance MkActionItem StartMessage where
|
||||
mkActionItem (StartMessage _ ai) = ai
|
||||
mkActionItem (StartUsualMessages _ ai) = ai
|
||||
mkActionItem (CustomOutput ai) = ai
|
||||
|
||||
{- A command is defined by specifying these things. -}
|
||||
data Command = Command
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue