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
This commit is contained in:
parent
1a9af823bc
commit
365dbc89dc
18 changed files with 154 additions and 61 deletions
|
@ -1,6 +1,6 @@
|
|||
{- git-annex command
|
||||
-
|
||||
- Copyright 2010-2021 Joey Hess <id@joeyh.name>
|
||||
- Copyright 2010-2023 Joey Hess <id@joeyh.name>
|
||||
-
|
||||
- Licensed under the GNU AGPL version 3 or higher.
|
||||
-}
|
||||
|
@ -17,8 +17,9 @@ import Logs.Group
|
|||
import qualified Data.Set as S
|
||||
|
||||
cmd :: Command
|
||||
cmd = command "trust" SectionSetup "trust a repository"
|
||||
(paramRepeating paramRepository) (withParams seek)
|
||||
cmd = withAnnexOptions [jsonOptions] $
|
||||
command "trust" SectionSetup "trust a repository"
|
||||
(paramRepeating paramRepository) (withParams seek)
|
||||
|
||||
seek :: CmdParams -> CommandSeek
|
||||
seek = trustCommand "trust" Trusted
|
||||
|
@ -30,7 +31,7 @@ trustCommand c level ps = withStrings (commandAction . start) ps
|
|||
start name = do
|
||||
u <- Remote.nameToUUID name
|
||||
let si = SeekInput [name]
|
||||
starting c (ActionItemOther (Just (UnquotedString name))) si (perform name u)
|
||||
starting c (ActionItemUUID u (UnquotedString name)) si (perform name u)
|
||||
perform name uuid = do
|
||||
when (level >= Trusted) $
|
||||
unlessM (Annex.getRead Annex.force) $
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue