mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Revert "--json-exceptions"

Browse source 
This reverts commit a325524454.

Turns out this was predicated on an incorrect belief that json output
didn't already sometimes lack the "key" field. Since json output already
can when `giveup` was used, it seems unncessary to add a whole new
option for this.
This commit is contained in:
Joey Hess 2023-04-25 17:37:34 -04:00
parent 7c514d717b
commit 91ba0cc7fd
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
33 changed files with 115 additions and 304 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Types/Messages.hs
View file

@ -9,7 +9,6 @@ module Types.Messages where
import qualified Utility.Aeson as Aeson
import Utility.Metered
import Utility.RawFilePath
import Control.Concurrent
import System.Console.Regions (ConsoleRegion)
@ -27,7 +26,6 @@ data OutputType
data JSONOptions = JSONOptions
{ jsonProgress :: Bool
, jsonErrorMessages :: Bool
, jsonExceptions :: Bool
}
deriving (Show)
@ -35,7 +33,6 @@ adjustOutputType :: OutputType -> OutputType -> OutputType
adjustOutputType (JSONOutput old) (JSONOutput new) = JSONOutput $ JSONOptions
{ jsonProgress = jsonProgress old || jsonProgress new
, jsonErrorMessages = jsonErrorMessages old || jsonErrorMessages new
, jsonExceptions = jsonExceptions old || jsonExceptions new
}
adjustOutputType _old new = new
@ -73,7 +70,6 @@ newMessageState = do
data SerializedOutput
= OutputMessage S.ByteString
| OutputError String
| OutputException String (Maybe RawFilePath) String
| BeginProgressMeter
| UpdateProgressMeterTotalSize TotalSize
| UpdateProgressMeter BytesProcessed