436f107715
The goal is to be able to run CommandStart in the main thread when -J is used, rather than unncessarily passing it off to a worker thread, which incurs overhead that is signficant when the CommandStart is going to quickly decide to stop. To do that, the message it displays needs to be displayed in the worker thread, after the CommandStart has run. Also, the change will mean that CommandStart will no longer necessarily run with the same Annex state as CommandPerform. While its docs already said it should avoid modifying Annex state, I audited all the CommandStart code as part of the conversion. (Note that CommandSeek already sometimes runs with a different Annex state, and that has not been a source of any problems, so I am not too worried that this change will lead to breakage going forward.) The only modification of Annex state I found was it calling allowMessages in some Commands that default to noMessages. Dealt with that by adding a startCustomOutput and a startingUsualMessages. This lets a command start with noMessages and then select the output it wants for each CommandStart. One bit of breakage: onlyActionOn has been removed from commands that used it. The plan is that, since a StartMessage contains an ActionItem, when a Key can be extracted from that, the parallel job runner can run onlyActionOn' automatically. Then commands won't need to worry about this detail. Future work. Otherwise, this was a fairly straightforward process of making each CommandStart compile again. Hopefully other behavior changes were mostly avoided. In a few cases, a command had a CommandStart that called a CommandPerform that then called showStart multiple times. I have collapsed those down to a single start action. The main command to perhaps suffer from it is Command.Direct, which used to show a start for each file, and no longer does. Another minor behavior change is that some commands used showStart before, but had an associated file and a Key available, so were changed to ShowStart with an ActionItemAssociatedFile. That will not change the normal output or behavior, but --json output will now include the key. This should not break it for anyone using a real json parser.
298 lines
8.5 KiB
Haskell
298 lines
8.5 KiB
Haskell
{- git-annex output messages
|
|
-
|
|
- Copyright 2010-2019 Joey Hess <id@joeyh.name>
|
|
-
|
|
- Licensed under the GNU AGPL version 3 or higher.
|
|
-}
|
|
|
|
module Messages (
|
|
showStart,
|
|
showStart',
|
|
showStartMessage,
|
|
StartMessage(..),
|
|
ActionItem(..),
|
|
mkActionItem,
|
|
showNote,
|
|
showAction,
|
|
showSideAction,
|
|
doSideAction,
|
|
doQuietSideAction,
|
|
doQuietAction,
|
|
showStoringStateAction,
|
|
showOutput,
|
|
showLongNote,
|
|
showInfo,
|
|
showEndOk,
|
|
showEndFail,
|
|
showEndResult,
|
|
endResult,
|
|
toplevelWarning,
|
|
warning,
|
|
earlyWarning,
|
|
warningIO,
|
|
indent,
|
|
JSON.JSONChunk(..),
|
|
maybeShowJSON,
|
|
showFullJSON,
|
|
showCustom,
|
|
showHeader,
|
|
showRaw,
|
|
setupConsole,
|
|
enableDebugOutput,
|
|
disableDebugOutput,
|
|
debugEnabled,
|
|
commandProgressDisabled,
|
|
outputMessage,
|
|
implicitMessage,
|
|
withMessageState,
|
|
prompt,
|
|
) where
|
|
|
|
import System.Log.Logger
|
|
import System.Log.Formatter
|
|
import System.Log.Handler (setFormatter)
|
|
import System.Log.Handler.Simple
|
|
import Control.Concurrent
|
|
|
|
import Common
|
|
import Types
|
|
import Types.Messages
|
|
import Types.ActionItem
|
|
import Types.Concurrency
|
|
import Types.Command (StartMessage(..))
|
|
import Types.Transfer (transferKey)
|
|
import Messages.Internal
|
|
import Messages.Concurrent
|
|
import qualified Messages.JSON as JSON
|
|
import qualified Annex
|
|
|
|
showStart :: String -> FilePath -> Annex ()
|
|
showStart command file = outputMessage json $
|
|
command ++ " " ++ file ++ " "
|
|
where
|
|
json = JSON.start command (Just file) Nothing
|
|
|
|
showStart' :: String -> Maybe String -> Annex ()
|
|
showStart' command mdesc = outputMessage json $
|
|
command ++ (maybe "" (" " ++) mdesc) ++ " "
|
|
where
|
|
json = JSON.start command Nothing Nothing
|
|
|
|
showStartKey :: String -> Key -> ActionItem -> Annex ()
|
|
showStartKey command key i = outputMessage json $
|
|
command ++ " " ++ actionItemDesc i ++ " "
|
|
where
|
|
json = JSON.start command (actionItemWorkTreeFile i) (Just key)
|
|
|
|
showStartMessage :: StartMessage -> Annex ()
|
|
showStartMessage (StartMessage command ai) = case ai of
|
|
ActionItemAssociatedFile _ k -> showStartKey command k ai
|
|
ActionItemKey k -> showStartKey command k ai
|
|
ActionItemBranchFilePath _ k -> showStartKey command k ai
|
|
ActionItemFailedTransfer t _ -> showStartKey command (transferKey t) ai
|
|
ActionItemWorkTreeFile file -> showStart command file
|
|
ActionItemOther msg -> showStart' command msg
|
|
showStartMessage (StartUsualMessages command ai) = do
|
|
outputType <$> Annex.getState Annex.output >>= \case
|
|
QuietOutput -> Annex.setOutput NormalOutput
|
|
_ -> noop
|
|
Annex.changeState $ \s -> s
|
|
{ Annex.output = (Annex.output s) { implicitMessages = True } }
|
|
showStartMessage (StartMessage command ai)
|
|
showStartMessage CustomOutput = do
|
|
Annex.setOutput QuietOutput
|
|
Annex.changeState $ \s -> s
|
|
{ Annex.output = (Annex.output s) { implicitMessages = False } }
|
|
|
|
showNote :: String -> Annex ()
|
|
showNote s = outputMessage (JSON.note s) $ "(" ++ s ++ ") "
|
|
|
|
showAction :: String -> Annex ()
|
|
showAction s = showNote $ s ++ "..."
|
|
|
|
showSideAction :: String -> Annex ()
|
|
showSideAction m = Annex.getState Annex.output >>= go
|
|
where
|
|
go st
|
|
| sideActionBlock st == StartBlock = do
|
|
p
|
|
let st' = st { sideActionBlock = InBlock }
|
|
Annex.changeState $ \s -> s { Annex.output = st' }
|
|
| sideActionBlock st == InBlock = return ()
|
|
| otherwise = p
|
|
p = outputMessage JSON.none $ "(" ++ m ++ "...)\n"
|
|
|
|
showStoringStateAction :: Annex ()
|
|
showStoringStateAction = showSideAction "recording state in git"
|
|
|
|
{- Performs an action, supressing showSideAction messages. -}
|
|
doQuietSideAction :: Annex a -> Annex a
|
|
doQuietSideAction = doSideAction' InBlock
|
|
|
|
{- Performs an action, that may call showSideAction multiple times.
|
|
- Only the first will be displayed. -}
|
|
doSideAction :: Annex a -> Annex a
|
|
doSideAction = doSideAction' StartBlock
|
|
|
|
doSideAction' :: SideActionBlock -> Annex a -> Annex a
|
|
doSideAction' b = bracket setup cleanup . const
|
|
where
|
|
setup = do
|
|
o <- Annex.getState Annex.output
|
|
set $ o { sideActionBlock = b }
|
|
return o
|
|
cleanup = set
|
|
set o = Annex.changeState $ \s -> s { Annex.output = o }
|
|
|
|
{- Performs an action, suppressing all normal standard output,
|
|
- but not json output. -}
|
|
doQuietAction :: Annex a -> Annex a
|
|
doQuietAction = bracket setup cleanup . const
|
|
where
|
|
setup = do
|
|
o <- Annex.getState Annex.output
|
|
case outputType o of
|
|
NormalOutput -> set $ o { outputType = QuietOutput }
|
|
_ -> noop
|
|
return o
|
|
cleanup = set
|
|
set o = Annex.changeState $ \s -> s { Annex.output = o }
|
|
|
|
{- Make way for subsequent output of a command. -}
|
|
showOutput :: Annex ()
|
|
showOutput = unlessM commandProgressDisabled $
|
|
outputMessage JSON.none "\n"
|
|
|
|
showLongNote :: String -> Annex ()
|
|
showLongNote s = outputMessage (JSON.note s) (formatLongNote s)
|
|
|
|
formatLongNote :: String -> String
|
|
formatLongNote s = '\n' : indent s ++ "\n"
|
|
|
|
-- Used by external special remote, displayed same as showLongNote
|
|
-- to console, but json object containing the info is emitted immediately.
|
|
showInfo :: String -> Annex ()
|
|
showInfo s = outputMessage' outputJSON (JSON.info s) (formatLongNote s)
|
|
|
|
showEndOk :: Annex ()
|
|
showEndOk = showEndResult True
|
|
|
|
showEndFail :: Annex ()
|
|
showEndFail = showEndResult False
|
|
|
|
showEndResult :: Bool -> Annex ()
|
|
showEndResult ok = outputMessage (JSON.end ok) $ endResult ok ++ "\n"
|
|
|
|
endResult :: Bool -> String
|
|
endResult True = "ok"
|
|
endResult False = "failed"
|
|
|
|
toplevelWarning :: Bool -> String -> Annex ()
|
|
toplevelWarning makeway s = warning' makeway ("git-annex: " ++ s)
|
|
|
|
warning :: String -> Annex ()
|
|
warning = warning' True . indent
|
|
|
|
earlyWarning :: String -> Annex ()
|
|
earlyWarning = warning' False
|
|
|
|
warning' :: Bool -> String -> Annex ()
|
|
warning' makeway w = do
|
|
when makeway $
|
|
outputMessage JSON.none "\n"
|
|
outputError (w ++ "\n")
|
|
|
|
{- Not concurrent output safe. -}
|
|
warningIO :: String -> IO ()
|
|
warningIO w = do
|
|
putStr "\n"
|
|
hFlush stdout
|
|
hPutStrLn stderr w
|
|
|
|
indent :: String -> String
|
|
indent = intercalate "\n" . map (\l -> " " ++ l) . lines
|
|
|
|
{- Shows a JSON chunk only when in json mode. -}
|
|
maybeShowJSON :: JSON.JSONChunk v -> Annex ()
|
|
maybeShowJSON v = void $ withMessageState $ bufferJSON (JSON.add v)
|
|
|
|
{- Shows a complete JSON value, only when in json mode. -}
|
|
showFullJSON :: JSON.JSONChunk v -> Annex Bool
|
|
showFullJSON v = withMessageState $ bufferJSON (JSON.complete v)
|
|
|
|
{- Performs an action that outputs nonstandard/customized output, and
|
|
- in JSON mode wraps its output in JSON.start and JSON.end, so it's
|
|
- a complete JSON document.
|
|
- This is only needed when showStart and showEndOk is not used.
|
|
-}
|
|
showCustom :: String -> Annex Bool -> Annex ()
|
|
showCustom command a = do
|
|
outputMessage (JSON.start command Nothing Nothing) ""
|
|
r <- a
|
|
outputMessage (JSON.end r) ""
|
|
|
|
showHeader :: String -> Annex ()
|
|
showHeader h = outputMessage JSON.none $ (h ++ ": ")
|
|
|
|
showRaw :: String -> Annex ()
|
|
showRaw s = outputMessage JSON.none (s ++ "\n")
|
|
|
|
setupConsole :: IO ()
|
|
setupConsole = do
|
|
s <- setFormatter
|
|
<$> streamHandler stderr DEBUG
|
|
<*> pure preciseLogFormatter
|
|
updateGlobalLogger rootLoggerName (setLevel NOTICE . setHandlers [s])
|
|
{- Force output to be line buffered. This is normally the case when
|
|
- it's connected to a terminal, but may not be when redirected to
|
|
- a file or a pipe. -}
|
|
hSetBuffering stdout LineBuffering
|
|
hSetBuffering stderr LineBuffering
|
|
|
|
{- Log formatter with precision into fractions of a second. -}
|
|
preciseLogFormatter :: LogFormatter a
|
|
preciseLogFormatter = tfLogFormatter "%F %X%Q" "[$time] $msg"
|
|
|
|
enableDebugOutput :: IO ()
|
|
enableDebugOutput = updateGlobalLogger rootLoggerName $ setLevel DEBUG
|
|
|
|
disableDebugOutput :: IO ()
|
|
disableDebugOutput = updateGlobalLogger rootLoggerName $ setLevel NOTICE
|
|
|
|
{- Checks if debugging is enabled. -}
|
|
debugEnabled :: IO Bool
|
|
debugEnabled = do
|
|
l <- getRootLogger
|
|
return $ getLevel l <= Just DEBUG
|
|
|
|
{- Should commands that normally output progress messages have that
|
|
- output disabled? -}
|
|
commandProgressDisabled :: Annex Bool
|
|
commandProgressDisabled = withMessageState $ \s -> return $
|
|
case outputType s of
|
|
QuietOutput -> True
|
|
JSONOutput _ -> True
|
|
NormalOutput -> concurrentOutputEnabled s
|
|
|
|
{- Use to show a message that is displayed implicitly, and so might be
|
|
- disabled when running a certian command that needs more control over its
|
|
- output. -}
|
|
implicitMessage :: Annex () -> Annex ()
|
|
implicitMessage = whenM (implicitMessages <$> Annex.getState Annex.output)
|
|
|
|
{- Prevents any concurrent console access while running an action, so
|
|
- that the action is the only thing using the console, and can eg prompt
|
|
- the user.
|
|
-}
|
|
prompt :: Annex a -> Annex a
|
|
prompt a = debugLocks $ Annex.getState Annex.concurrency >>= \case
|
|
NonConcurrent -> a
|
|
(Concurrent _) -> goconcurrent
|
|
ConcurrentPerCpu -> goconcurrent
|
|
where
|
|
goconcurrent = withMessageState $ \s -> do
|
|
let l = promptLock s
|
|
bracketIO
|
|
(takeMVar l)
|
|
(putMVar l)
|
|
(const $ hideRegionsWhile s a)
|