2010-11-08 19:15:21 +00:00
|
|
|
{- git-annex output messages
|
|
|
|
-
|
git style filename quoting controlled by core.quotePath
This is by no means complete, but escaping filenames in actionItemDesc does
cover most commands.
Note that for ActionItemBranchFilePath, the value is branch:file, and I
choose to only quote the file part (if necessary). I considered quoting the
whole thing. But, branch names cannot contain control characters, and while
they can contain unicode, git coes not quote unicode when displaying branch
names. So, it would be surprising for git-annex to quote unicode in a
branch name.
The find command is the most obvious command that still needs to be
dealt with. There are probably other places that filenames also get
displayed, eg embedded in error messages.
Some other commands use ActionItemOther with a filename, I think that
ActionItemOther should either be pre-sanitized, or should explicitly not
be used for filenames, so that needs more work.
When --json is used, unicode does not get escaped, but control
characters were already escaped in json.
(Key escaping may turn out to be needed, but I'm ignoring that for now.)
Sponsored-by: unqueued on Patreon
2023-04-08 18:20:02 +00:00
|
|
|
- Copyright 2010-2023 Joey Hess <id@joeyh.name>
|
2010-11-08 19:15:21 +00:00
|
|
|
-
|
2019-03-13 19:48:14 +00:00
|
|
|
- Licensed under the GNU AGPL version 3 or higher.
|
2010-11-08 19:15:21 +00:00
|
|
|
-}
|
|
|
|
|
2023-04-12 21:04:57 +00:00
|
|
|
{-# LANGUAGE OverloadedStrings, ScopedTypeVariables #-}
|
2019-11-26 19:27:22 +00:00
|
|
|
|
2011-09-01 19:16:31 +00:00
|
|
|
module Messages (
|
make CommandStart return a StartMessage
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.
2019-06-06 19:42:30 +00:00
|
|
|
showStartMessage,
|
2019-06-12 17:33:15 +00:00
|
|
|
showEndMessage,
|
make CommandStart return a StartMessage
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.
2019-06-06 19:42:30 +00:00
|
|
|
StartMessage(..),
|
|
|
|
ActionItem(..),
|
2016-07-20 19:22:55 +00:00
|
|
|
mkActionItem,
|
2011-09-01 19:16:31 +00:00
|
|
|
showNote,
|
|
|
|
showAction,
|
|
|
|
showSideAction,
|
2012-04-27 17:23:52 +00:00
|
|
|
doSideAction,
|
2012-05-20 04:14:56 +00:00
|
|
|
doQuietSideAction,
|
2018-10-16 17:30:04 +00:00
|
|
|
doQuietAction,
|
2012-04-27 17:23:52 +00:00
|
|
|
showStoringStateAction,
|
2011-09-01 19:16:31 +00:00
|
|
|
showOutput,
|
|
|
|
showLongNote,
|
2018-02-06 17:03:55 +00:00
|
|
|
showInfo,
|
2011-09-01 19:16:31 +00:00
|
|
|
showEndOk,
|
|
|
|
showEndFail,
|
|
|
|
showEndResult,
|
2015-04-14 20:46:06 +00:00
|
|
|
endResult,
|
2023-04-26 16:53:30 +00:00
|
|
|
MessageId(..),
|
2023-04-25 23:26:20 +00:00
|
|
|
toplevelFileProblem,
|
2015-04-30 19:28:17 +00:00
|
|
|
toplevelWarning,
|
2011-09-01 19:16:31 +00:00
|
|
|
warning,
|
2015-11-10 18:44:58 +00:00
|
|
|
earlyWarning,
|
2013-03-05 03:27:18 +00:00
|
|
|
warningIO,
|
2011-09-01 19:16:31 +00:00
|
|
|
indent,
|
2016-09-09 22:13:55 +00:00
|
|
|
JSON.JSONChunk(..),
|
2011-09-02 20:44:04 +00:00
|
|
|
maybeShowJSON,
|
2023-04-25 23:26:20 +00:00
|
|
|
maybeShowJSON',
|
2023-05-08 20:03:34 +00:00
|
|
|
maybeAddJSONField,
|
2011-12-23 02:03:18 +00:00
|
|
|
showFullJSON,
|
2011-11-15 04:30:00 +00:00
|
|
|
showCustom,
|
|
|
|
showHeader,
|
|
|
|
showRaw,
|
2013-06-18 00:41:17 +00:00
|
|
|
setupConsole,
|
|
|
|
enableDebugOutput,
|
2015-04-04 18:34:03 +00:00
|
|
|
commandProgressDisabled,
|
2021-07-19 15:28:31 +00:00
|
|
|
commandProgressDisabled',
|
2020-09-22 18:10:30 +00:00
|
|
|
jsonOutputEnabled,
|
2016-01-06 16:33:32 +00:00
|
|
|
outputMessage,
|
2016-09-09 16:57:42 +00:00
|
|
|
withMessageState,
|
2021-07-19 15:28:31 +00:00
|
|
|
MessageState,
|
2017-05-11 21:33:18 +00:00
|
|
|
prompt,
|
2020-01-22 20:38:34 +00:00
|
|
|
mkPrompter,
|
2023-04-12 18:21:53 +00:00
|
|
|
sanitizeTopLevelExceptionMessages,
|
2011-09-01 19:16:31 +00:00
|
|
|
) where
|
2010-11-08 19:15:21 +00:00
|
|
|
|
2017-05-11 21:33:18 +00:00
|
|
|
import Control.Concurrent
|
2020-01-22 20:38:34 +00:00
|
|
|
import Control.Monad.IO.Class
|
2019-11-26 19:27:22 +00:00
|
|
|
import qualified Data.ByteString as S
|
filter out control characters in warning messages
Converted warning and similar to use StringContainingQuotedPath. Most
warnings are static strings, some do refer to filepaths that need to be
quoted, and others don't need quoting.
Note that, since quote filters out control characters of even
UnquotedString, this makes all warnings safe, even when an attacker
sneaks in a control character in some other way.
When json is being output, no quoting is done, since json gets its own
quoting.
This does, as a side effect, make warning messages in json output not
be indented. The indentation is only needed to offset warning messages
underneath the display of the file they apply to, so that's ok.
Sponsored-by: Brett Eisenberg on Patreon
2023-04-10 18:47:32 +00:00
|
|
|
import qualified Data.ByteString.Char8 as S8
|
2023-04-12 18:21:53 +00:00
|
|
|
import System.Exit
|
2023-04-12 21:04:57 +00:00
|
|
|
import qualified Control.Monad.Catch as M
|
2023-05-01 16:25:14 +00:00
|
|
|
import Data.String
|
2010-11-08 19:15:21 +00:00
|
|
|
|
2015-04-03 20:48:30 +00:00
|
|
|
import Common
|
2010-11-08 19:15:21 +00:00
|
|
|
import Types
|
2012-04-27 17:23:52 +00:00
|
|
|
import Types.Messages
|
2016-08-03 16:37:12 +00:00
|
|
|
import Types.ActionItem
|
2017-05-13 17:13:13 +00:00
|
|
|
import Types.Concurrency
|
2020-09-15 20:22:44 +00:00
|
|
|
import Types.Command (StartMessage(..), SeekInput)
|
2015-04-03 20:48:30 +00:00
|
|
|
import Messages.Internal
|
2017-05-16 19:28:06 +00:00
|
|
|
import Messages.Concurrent
|
2021-04-06 19:14:00 +00:00
|
|
|
import Annex.Debug
|
2020-09-16 15:41:28 +00:00
|
|
|
import Annex.Concurrent.Utility
|
2023-04-10 21:03:41 +00:00
|
|
|
import Utility.SafeOutput
|
2023-04-12 21:18:29 +00:00
|
|
|
import Git.Quote
|
2013-03-28 21:03:04 +00:00
|
|
|
import qualified Messages.JSON as JSON
|
2010-11-08 19:15:21 +00:00
|
|
|
import qualified Annex
|
|
|
|
|
make CommandStart return a StartMessage
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.
2019-06-06 19:42:30 +00:00
|
|
|
showStartMessage :: StartMessage -> Annex ()
|
expire, trust et al, dead, describe: Support --json and --json-error-messages
For expire, the normal output is unchanged, but the --json output includes the uuid
in machine parseable form. Which could be very useful for this somewhat obscure
command. That needed ActionItemUUID to be implemented, which seemed like a lot
of work, but then ---
I had been going to skip implementing them for trust, untrust, dead, semitrust,
and describe, but putting the uuid in the json is useful information, it tells
what uuid git-annex picked given the input. It was not hard to support
these once ActionItemUUID was implemented.
Sponsored-By: the NIH-funded NICEMAN (ReproNim TR&D3) project
2023-05-05 19:29:49 +00:00
|
|
|
showStartMessage (StartMessage command ai si) =
|
|
|
|
outputMessage json id $
|
|
|
|
UnquotedString command <> " " <> actionItemDesc ai <> " "
|
|
|
|
where
|
|
|
|
json = JSON.startActionItem command ai si
|
2020-09-14 20:49:33 +00:00
|
|
|
showStartMessage (StartUsualMessages command ai si) = do
|
make CommandStart return a StartMessage
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.
2019-06-06 19:42:30 +00:00
|
|
|
outputType <$> Annex.getState Annex.output >>= \case
|
|
|
|
QuietOutput -> Annex.setOutput NormalOutput
|
|
|
|
_ -> noop
|
2020-09-14 20:49:33 +00:00
|
|
|
showStartMessage (StartMessage command ai si)
|
2019-06-12 18:11:23 +00:00
|
|
|
showStartMessage (StartNoMessage _) = noop
|
2019-07-05 13:58:37 +00:00
|
|
|
showStartMessage (CustomOutput _) =
|
|
|
|
outputType <$> Annex.getState Annex.output >>= \case
|
|
|
|
NormalOutput -> Annex.setOutput QuietOutput
|
|
|
|
_ -> noop
|
2019-06-12 17:33:15 +00:00
|
|
|
|
|
|
|
-- Only show end result if the StartMessage is one that gets displayed.
|
|
|
|
showEndMessage :: StartMessage -> Bool -> Annex ()
|
2020-09-14 20:49:33 +00:00
|
|
|
showEndMessage (StartMessage _ _ _) = showEndResult
|
|
|
|
showEndMessage (StartUsualMessages _ _ _) = showEndResult
|
2019-06-12 18:11:23 +00:00
|
|
|
showEndMessage (StartNoMessage _) = const noop
|
2019-06-12 17:33:15 +00:00
|
|
|
showEndMessage (CustomOutput _) = const noop
|
make CommandStart return a StartMessage
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.
2019-06-06 19:42:30 +00:00
|
|
|
|
2023-04-10 21:03:41 +00:00
|
|
|
showNote :: StringContainingQuotedPath -> Annex ()
|
|
|
|
showNote s = outputMessage (JSON.note (decodeBS (noquote s))) id $ "(" <> s <> ") "
|
2011-07-19 18:07:23 +00:00
|
|
|
|
2023-04-10 21:03:41 +00:00
|
|
|
showAction :: StringContainingQuotedPath -> Annex ()
|
|
|
|
showAction s = showNote $ s <> "..."
|
2010-11-08 19:15:21 +00:00
|
|
|
|
2023-04-10 21:03:41 +00:00
|
|
|
showSideAction :: StringContainingQuotedPath -> Annex ()
|
2012-04-27 17:23:52 +00:00
|
|
|
showSideAction m = Annex.getState Annex.output >>= go
|
2012-10-29 02:09:09 +00:00
|
|
|
where
|
2012-11-25 21:54:08 +00:00
|
|
|
go st
|
|
|
|
| sideActionBlock st == StartBlock = do
|
2021-06-16 00:43:00 +00:00
|
|
|
go'
|
2012-11-25 21:54:08 +00:00
|
|
|
let st' = st { sideActionBlock = InBlock }
|
|
|
|
Annex.changeState $ \s -> s { Annex.output = st' }
|
|
|
|
| sideActionBlock st == InBlock = return ()
|
2021-06-16 00:43:00 +00:00
|
|
|
| otherwise = go'
|
2023-04-10 21:03:41 +00:00
|
|
|
go' = outputMessage JSON.none id $ "(" <> m <> "...)\n"
|
2012-04-27 17:23:52 +00:00
|
|
|
|
|
|
|
showStoringStateAction :: Annex ()
|
2015-01-10 17:41:25 +00:00
|
|
|
showStoringStateAction = showSideAction "recording state in git"
|
2012-04-27 17:23:52 +00:00
|
|
|
|
2023-03-14 02:39:16 +00:00
|
|
|
{- Performs an action, suppressing showSideAction messages. -}
|
2012-05-20 04:14:56 +00:00
|
|
|
doQuietSideAction :: Annex a -> Annex a
|
|
|
|
doQuietSideAction = doSideAction' InBlock
|
|
|
|
|
2012-04-27 17:23:52 +00:00
|
|
|
{- Performs an action, that may call showSideAction multiple times.
|
|
|
|
- Only the first will be displayed. -}
|
|
|
|
doSideAction :: Annex a -> Annex a
|
2012-05-20 04:14:56 +00:00
|
|
|
doSideAction = doSideAction' StartBlock
|
|
|
|
|
|
|
|
doSideAction' :: SideActionBlock -> Annex a -> Annex a
|
2018-10-16 17:30:04 +00:00
|
|
|
doSideAction' b = bracket setup cleanup . const
|
2012-10-29 02:09:09 +00:00
|
|
|
where
|
2018-10-16 17:30:04 +00:00
|
|
|
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
|
2012-10-29 02:09:09 +00:00
|
|
|
set o = Annex.changeState $ \s -> s { Annex.output = o }
|
2011-07-19 18:07:23 +00:00
|
|
|
|
2015-04-03 20:48:30 +00:00
|
|
|
{- Make way for subsequent output of a command. -}
|
2011-07-19 18:07:23 +00:00
|
|
|
showOutput :: Annex ()
|
2015-04-04 18:34:03 +00:00
|
|
|
showOutput = unlessM commandProgressDisabled $
|
2023-04-10 21:03:41 +00:00
|
|
|
outputMessage JSON.none id "\n"
|
2010-11-08 19:15:21 +00:00
|
|
|
|
2023-04-10 21:03:41 +00:00
|
|
|
showLongNote :: StringContainingQuotedPath -> Annex ()
|
|
|
|
showLongNote s = outputMessage (JSON.note (decodeBS (noquote s))) formatLongNote s
|
2018-02-06 17:03:55 +00:00
|
|
|
|
filter out control characters in warning messages
Converted warning and similar to use StringContainingQuotedPath. Most
warnings are static strings, some do refer to filepaths that need to be
quoted, and others don't need quoting.
Note that, since quote filters out control characters of even
UnquotedString, this makes all warnings safe, even when an attacker
sneaks in a control character in some other way.
When json is being output, no quoting is done, since json gets its own
quoting.
This does, as a side effect, make warning messages in json output not
be indented. The indentation is only needed to offset warning messages
underneath the display of the file they apply to, so that's ok.
Sponsored-by: Brett Eisenberg on Patreon
2023-04-10 18:47:32 +00:00
|
|
|
formatLongNote :: S.ByteString -> S.ByteString
|
|
|
|
formatLongNote s = "\n" <> indent s <> "\n"
|
2018-02-06 17:03:55 +00:00
|
|
|
|
|
|
|
-- Used by external special remote, displayed same as showLongNote
|
|
|
|
-- to console, but json object containing the info is emitted immediately.
|
2023-04-10 21:03:41 +00:00
|
|
|
showInfo :: StringContainingQuotedPath -> Annex ()
|
|
|
|
showInfo s = outputMessage' outputJSON (JSON.info (decodeBS (noquote s))) formatLongNote s
|
2011-01-27 00:30:07 +00:00
|
|
|
|
2010-11-08 19:15:21 +00:00
|
|
|
showEndOk :: Annex ()
|
2011-09-01 19:16:31 +00:00
|
|
|
showEndOk = showEndResult True
|
2010-11-08 19:15:21 +00:00
|
|
|
|
|
|
|
showEndFail :: Annex ()
|
2011-09-01 19:16:31 +00:00
|
|
|
showEndFail = showEndResult False
|
2010-11-08 19:15:21 +00:00
|
|
|
|
2011-05-15 16:25:58 +00:00
|
|
|
showEndResult :: Bool -> Annex ()
|
2023-04-10 21:03:41 +00:00
|
|
|
showEndResult ok = outputMessage (JSON.end ok) id $
|
|
|
|
UnquotedByteString (endResult ok) <> "\n"
|
2015-04-14 20:46:06 +00:00
|
|
|
|
2019-11-26 19:27:22 +00:00
|
|
|
endResult :: Bool -> S.ByteString
|
2015-04-14 20:46:06 +00:00
|
|
|
endResult True = "ok"
|
|
|
|
endResult False = "failed"
|
2011-05-15 16:25:58 +00:00
|
|
|
|
2023-05-01 16:25:14 +00:00
|
|
|
toplevelMsg :: (Semigroup t, IsString t) => t -> t
|
|
|
|
toplevelMsg s = fromString "git-annex: " <> s
|
2023-04-25 23:26:20 +00:00
|
|
|
|
2023-04-26 16:53:30 +00:00
|
|
|
toplevelFileProblem :: Bool -> MessageId -> StringContainingQuotedPath -> String -> RawFilePath -> Maybe Key -> SeekInput -> Annex ()
|
|
|
|
toplevelFileProblem makeway messageid msg action file mkey si = do
|
2023-04-25 23:26:20 +00:00
|
|
|
maybeShowJSON' $ JSON.start action (Just file) mkey si
|
2023-04-26 16:53:30 +00:00
|
|
|
maybeShowJSON' $ JSON.messageid messageid
|
2023-04-25 23:26:20 +00:00
|
|
|
warning' makeway id (toplevelMsg (QuotedPath file <> " " <> msg))
|
|
|
|
maybeShowJSON' $ JSON.end False
|
|
|
|
|
filter out control characters in warning messages
Converted warning and similar to use StringContainingQuotedPath. Most
warnings are static strings, some do refer to filepaths that need to be
quoted, and others don't need quoting.
Note that, since quote filters out control characters of even
UnquotedString, this makes all warnings safe, even when an attacker
sneaks in a control character in some other way.
When json is being output, no quoting is done, since json gets its own
quoting.
This does, as a side effect, make warning messages in json output not
be indented. The indentation is only needed to offset warning messages
underneath the display of the file they apply to, so that's ok.
Sponsored-by: Brett Eisenberg on Patreon
2023-04-10 18:47:32 +00:00
|
|
|
toplevelWarning :: Bool -> StringContainingQuotedPath -> Annex ()
|
2023-04-25 23:26:20 +00:00
|
|
|
toplevelWarning makeway s = warning' makeway id (toplevelMsg s)
|
2010-11-08 19:15:21 +00:00
|
|
|
|
filter out control characters in warning messages
Converted warning and similar to use StringContainingQuotedPath. Most
warnings are static strings, some do refer to filepaths that need to be
quoted, and others don't need quoting.
Note that, since quote filters out control characters of even
UnquotedString, this makes all warnings safe, even when an attacker
sneaks in a control character in some other way.
When json is being output, no quoting is done, since json gets its own
quoting.
This does, as a side effect, make warning messages in json output not
be indented. The indentation is only needed to offset warning messages
underneath the display of the file they apply to, so that's ok.
Sponsored-by: Brett Eisenberg on Patreon
2023-04-10 18:47:32 +00:00
|
|
|
warning :: StringContainingQuotedPath -> Annex ()
|
|
|
|
warning = warning' True indent
|
2011-09-06 17:46:08 +00:00
|
|
|
|
filter out control characters in warning messages
Converted warning and similar to use StringContainingQuotedPath. Most
warnings are static strings, some do refer to filepaths that need to be
quoted, and others don't need quoting.
Note that, since quote filters out control characters of even
UnquotedString, this makes all warnings safe, even when an attacker
sneaks in a control character in some other way.
When json is being output, no quoting is done, since json gets its own
quoting.
This does, as a side effect, make warning messages in json output not
be indented. The indentation is only needed to offset warning messages
underneath the display of the file they apply to, so that's ok.
Sponsored-by: Brett Eisenberg on Patreon
2023-04-10 18:47:32 +00:00
|
|
|
earlyWarning :: StringContainingQuotedPath -> Annex ()
|
|
|
|
earlyWarning = warning' False id
|
2015-11-10 18:44:58 +00:00
|
|
|
|
filter out control characters in warning messages
Converted warning and similar to use StringContainingQuotedPath. Most
warnings are static strings, some do refer to filepaths that need to be
quoted, and others don't need quoting.
Note that, since quote filters out control characters of even
UnquotedString, this makes all warnings safe, even when an attacker
sneaks in a control character in some other way.
When json is being output, no quoting is done, since json gets its own
quoting.
This does, as a side effect, make warning messages in json output not
be indented. The indentation is only needed to offset warning messages
underneath the display of the file they apply to, so that's ok.
Sponsored-by: Brett Eisenberg on Patreon
2023-04-10 18:47:32 +00:00
|
|
|
warning' :: Bool -> (S.ByteString -> S.ByteString) -> StringContainingQuotedPath -> Annex ()
|
2023-04-25 23:26:20 +00:00
|
|
|
warning' makeway consolewhitespacef msg = do
|
2015-04-30 19:28:17 +00:00
|
|
|
when makeway $
|
2023-04-10 21:03:41 +00:00
|
|
|
outputMessage JSON.none id "\n"
|
2023-04-25 23:26:20 +00:00
|
|
|
outputError (\s -> consolewhitespacef s <> "\n") msg
|
2011-01-27 00:30:07 +00:00
|
|
|
|
2015-11-04 17:45:34 +00:00
|
|
|
{- Not concurrent output safe. -}
|
2013-03-05 03:27:18 +00:00
|
|
|
warningIO :: String -> IO ()
|
|
|
|
warningIO w = do
|
|
|
|
putStr "\n"
|
|
|
|
hFlush stdout
|
2023-04-10 21:03:41 +00:00
|
|
|
hPutStrLn stderr (safeOutput w)
|
2013-03-05 03:27:18 +00:00
|
|
|
|
filter out control characters in warning messages
Converted warning and similar to use StringContainingQuotedPath. Most
warnings are static strings, some do refer to filepaths that need to be
quoted, and others don't need quoting.
Note that, since quote filters out control characters of even
UnquotedString, this makes all warnings safe, even when an attacker
sneaks in a control character in some other way.
When json is being output, no quoting is done, since json gets its own
quoting.
This does, as a side effect, make warning messages in json output not
be indented. The indentation is only needed to offset warning messages
underneath the display of the file they apply to, so that's ok.
Sponsored-by: Brett Eisenberg on Patreon
2023-04-10 18:47:32 +00:00
|
|
|
indent :: S.ByteString -> S.ByteString
|
|
|
|
indent = S.intercalate "\n" . map (" " <>) . S8.lines
|
2011-02-10 18:21:44 +00:00
|
|
|
|
2016-07-26 17:30:07 +00:00
|
|
|
{- Shows a JSON chunk only when in json mode. -}
|
2016-09-09 22:13:55 +00:00
|
|
|
maybeShowJSON :: JSON.JSONChunk v -> Annex ()
|
2018-02-06 17:03:55 +00:00
|
|
|
maybeShowJSON v = void $ withMessageState $ bufferJSON (JSON.add v)
|
2011-11-15 04:30:00 +00:00
|
|
|
|
2023-04-25 23:26:20 +00:00
|
|
|
maybeShowJSON' :: JSON.JSONBuilder -> Annex ()
|
|
|
|
maybeShowJSON' v = void $ withMessageState $ bufferJSON v
|
|
|
|
|
2023-05-08 20:03:34 +00:00
|
|
|
{- Adds a field to the current json object. -}
|
|
|
|
maybeAddJSONField :: JSON.ToJSON' v => String -> v -> Annex ()
|
|
|
|
maybeAddJSONField f v = case JSON.toJSON' (JSON.AddJSONActionItemField f v) of
|
|
|
|
JSON.Object o -> maybeShowJSON $ JSON.AesonObject o
|
|
|
|
_ -> noop
|
|
|
|
|
2011-12-23 02:03:18 +00:00
|
|
|
{- Shows a complete JSON value, only when in json mode. -}
|
2016-09-09 22:13:55 +00:00
|
|
|
showFullJSON :: JSON.JSONChunk v -> Annex Bool
|
2018-02-06 17:03:55 +00:00
|
|
|
showFullJSON v = withMessageState $ bufferJSON (JSON.complete v)
|
2011-12-23 02:03:18 +00:00
|
|
|
|
2011-11-15 04:30:00 +00:00
|
|
|
{- 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.
|
2023-04-10 21:03:41 +00:00
|
|
|
- This is only needed when showStartMessage and showEndOk is not used.
|
2015-11-04 17:45:34 +00:00
|
|
|
-}
|
2020-09-15 20:22:44 +00:00
|
|
|
showCustom :: String -> SeekInput -> Annex Bool -> Annex ()
|
|
|
|
showCustom command si a = do
|
2023-04-10 21:03:41 +00:00
|
|
|
outputMessage (JSON.start command Nothing Nothing si) id ""
|
2011-11-15 04:30:00 +00:00
|
|
|
r <- a
|
2023-04-10 21:03:41 +00:00
|
|
|
outputMessage (JSON.end r) id ""
|
2011-11-15 04:30:00 +00:00
|
|
|
|
2019-11-26 19:27:22 +00:00
|
|
|
showHeader :: S.ByteString -> Annex ()
|
2023-04-10 21:03:41 +00:00
|
|
|
showHeader h = outputMessage JSON.none id (UnquotedByteString h <> ": ")
|
2011-11-15 04:30:00 +00:00
|
|
|
|
2019-11-26 19:27:22 +00:00
|
|
|
showRaw :: S.ByteString -> Annex ()
|
2023-04-10 21:03:41 +00:00
|
|
|
showRaw s = outputMessage JSON.none id (UnquotedByteString s <> "\n")
|
2011-11-15 04:30:00 +00:00
|
|
|
|
2011-03-12 19:30:17 +00:00
|
|
|
setupConsole :: IO ()
|
support all filename encodings with ghc 7.4
Under ghc 7.4, this seems to be able to handle all filename encodings
again. Including filename encodings that do not match the LANG setting.
I think this will not work with earlier versions of ghc, it uses some ghc
internals.
Turns out that ghc 7.4 has a special filesystem encoding that it uses when
reading/writing filenames (as FilePaths). This encoding is documented
to allow "arbitrary undecodable bytes to be round-tripped through it".
So, to get FilePaths from eg, git ls-files, set the Handle that is reading
from git to use this encoding. Then things basically just work.
However, I have not found a way to make Text read using this encoding.
Text really does assume unicode. So I had to switch back to using String
when reading/writing data to git. Which is a pity, because it's some
percent slower, but at least it works.
Note that stdout and stderr also have to be set to this encoding, or
printing out filenames that contain undecodable bytes causes a crash.
IMHO this is a misfeature in ghc, that the user can pass you a filename,
which you can readFile, etc, but that default, putStr of filename may
cause a crash!
Git.CheckAttr gave me special trouble, because the filenames I got back
from git, after feeding them in, had further encoding breakage.
Rather than try to deal with that, I just zip up the input filenames
with the attributes. Which must be returned in the same order queried
for this to work.
Also of note is an apparent GHC bug I worked around in Git.CheckAttr. It
used to forkProcess and feed git from the child process. Unfortunatly,
after this forkProcess, accessing the `files` variable from the parent
returns []. Not the value that was passed into the function. This screams
of a bad bug, that's clobbering a variable, but for now I just avoid
forkProcess there to work around it. That forkProcess was itself only added
because of a ghc bug, #624389. I've confirmed that the test case for that
bug doesn't reproduce it with ghc 7.4. So that's ok, except for the new ghc
bug I have not isolated and reported. Why does this simple bit of code
magnet the ghc bugs? :)
Also, the symlink touching code is currently broken, when used on utf-8
filenames in a non-utf-8 locale, or probably on any filename containing
undecodable bytes, and I temporarily commented it out.
2012-02-03 19:12:41 +00:00
|
|
|
setupConsole = do
|
2021-04-05 17:40:31 +00:00
|
|
|
dd <- debugDisplayer
|
2021-04-06 19:14:00 +00:00
|
|
|
configureDebug dd (DebugSelector (const False))
|
2016-01-18 17:01:23 +00:00
|
|
|
{- 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
|
2015-09-09 21:02:00 +00:00
|
|
|
|
2021-04-05 19:21:20 +00:00
|
|
|
enableDebugOutput :: Annex ()
|
2021-04-05 17:40:31 +00:00
|
|
|
enableDebugOutput = do
|
2021-04-06 19:14:00 +00:00
|
|
|
selector <- Annex.getRead Annex.debugselector
|
2021-04-05 19:21:20 +00:00
|
|
|
dd <- liftIO debugDisplayer
|
2021-04-06 19:14:00 +00:00
|
|
|
liftIO $ configureDebug dd selector
|
2021-04-05 19:21:20 +00:00
|
|
|
|
2021-04-05 17:40:31 +00:00
|
|
|
debugDisplayer :: IO (S.ByteString -> IO ())
|
|
|
|
debugDisplayer = do
|
|
|
|
-- Debug output will get mixed in with any other output
|
|
|
|
-- made by git-annex, but use a lock to prevent two debug lines
|
|
|
|
-- that are displayed at the same time from mixing together.
|
|
|
|
lock <- newMVar ()
|
|
|
|
return $ \s -> withMVar lock $ \() -> do
|
2023-04-10 21:03:41 +00:00
|
|
|
S.hPutStr stderr (safeOutput s <> "\n")
|
2021-04-05 17:40:31 +00:00
|
|
|
hFlush stderr
|
2015-08-13 19:05:39 +00:00
|
|
|
|
2015-04-04 18:34:03 +00:00
|
|
|
{- Should commands that normally output progress messages have that
|
|
|
|
- output disabled? -}
|
|
|
|
commandProgressDisabled :: Annex Bool
|
2021-07-19 15:28:31 +00:00
|
|
|
commandProgressDisabled = withMessageState $ return . commandProgressDisabled'
|
|
|
|
|
|
|
|
commandProgressDisabled' :: MessageState -> Bool
|
|
|
|
commandProgressDisabled' s = case outputType s of
|
|
|
|
NormalOutput -> concurrentOutputEnabled s
|
|
|
|
QuietOutput -> True
|
|
|
|
JSONOutput _ -> True
|
|
|
|
SerializedOutput _ _ -> True
|
2016-01-20 18:07:13 +00:00
|
|
|
|
2020-09-22 18:10:30 +00:00
|
|
|
jsonOutputEnabled :: Annex Bool
|
|
|
|
jsonOutputEnabled = withMessageState $ \s -> return $
|
|
|
|
case outputType s of
|
|
|
|
JSONOutput _ -> True
|
|
|
|
_ -> False
|
|
|
|
|
2017-05-11 21:33:18 +00:00
|
|
|
{- 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.
|
|
|
|
-}
|
2017-05-16 19:28:06 +00:00
|
|
|
prompt :: Annex a -> Annex a
|
2020-01-22 20:38:34 +00:00
|
|
|
prompt a = do
|
|
|
|
p <- mkPrompter
|
|
|
|
p a
|
|
|
|
|
|
|
|
{- Like prompt, but for a non-annex action that prompts. -}
|
|
|
|
mkPrompter :: (MonadMask m, MonadIO m) => Annex (m a -> m a)
|
2020-09-16 15:41:28 +00:00
|
|
|
mkPrompter = getConcurrency >>= \case
|
2020-01-22 20:38:34 +00:00
|
|
|
NonConcurrent -> return id
|
2019-05-10 17:24:31 +00:00
|
|
|
(Concurrent _) -> goconcurrent
|
|
|
|
ConcurrentPerCpu -> goconcurrent
|
2017-05-13 17:13:13 +00:00
|
|
|
where
|
2019-05-10 17:24:31 +00:00
|
|
|
goconcurrent = withMessageState $ \s -> do
|
2017-05-13 17:13:13 +00:00
|
|
|
let l = promptLock s
|
2020-12-04 18:54:09 +00:00
|
|
|
let (run, cleanup) = case outputType s of
|
|
|
|
SerializedOutput h hr ->
|
|
|
|
( \a -> do
|
2020-12-11 16:39:00 +00:00
|
|
|
liftIO $ outputSerialized h BeginPrompt
|
2020-12-04 18:54:09 +00:00
|
|
|
liftIO $ waitOutputSerializedResponse hr ReadyPrompt
|
|
|
|
a
|
|
|
|
, liftIO $ outputSerialized h EndPrompt
|
|
|
|
)
|
|
|
|
_ ->
|
|
|
|
( hideRegionsWhile s
|
|
|
|
, noop
|
|
|
|
)
|
2020-01-22 20:38:34 +00:00
|
|
|
return $ \a ->
|
|
|
|
debugLocks $ bracketIO
|
|
|
|
(takeMVar l)
|
2020-12-04 18:54:09 +00:00
|
|
|
(\v -> putMVar l v >> cleanup)
|
|
|
|
(const $ run a)
|
2023-04-12 18:21:53 +00:00
|
|
|
|
2023-04-12 21:04:57 +00:00
|
|
|
{- Catch all (non-async and not ExitCode) exceptions and display,
|
|
|
|
- santizing any control characters in the exceptions.
|
|
|
|
-
|
|
|
|
- Exits nonzero on exception, so should only be used at topmost level.
|
|
|
|
-}
|
2023-04-12 18:21:53 +00:00
|
|
|
sanitizeTopLevelExceptionMessages :: IO a -> IO a
|
2023-04-12 21:04:57 +00:00
|
|
|
sanitizeTopLevelExceptionMessages a = a `catches`
|
|
|
|
((M.Handler (\ (e :: ExitCode) -> throwM e)) : nonAsyncHandler go)
|
2023-04-12 18:21:53 +00:00
|
|
|
where
|
|
|
|
go e = do
|
2023-05-01 16:25:14 +00:00
|
|
|
hPutStrLn stderr $ safeOutput $ toplevelMsg (show e)
|
2023-04-12 18:21:53 +00:00
|
|
|
exitWith $ ExitFailure 1
|