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

improve json when showStart' is given only a key

Browse source 
Before, the json contained file:key; change that to key:

If a file and a key are given, inclue both file: and key:
This commit is contained in:
Joey Hess 2016-03-06 12:56:39 -04:00
parent 78fa865721
commit acf74ae945
Failed to extract signature
2 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Messages.hs
View file

@ -54,12 +54,12 @@ import Types.Key
import qualified Annex
showStart :: String -> FilePath -> Annex ()
showStart command file = outputMessage (JSON.start command $ Just file) $
showStart command file = outputMessage (JSON.start command (Just file) Nothing) $
command ++ " " ++ file ++ " "
showStart' :: String -> Key -> Maybe FilePath -> Annex ()
showStart' command key afile = showStart command $
fromMaybe (key2file key) afile
showStart' command key afile = outputMessage (JSON.start command afile (Just key)) $
command ++ " " ++ fromMaybe (key2file key) afile ++ " "
showNote :: String -> Annex ()
showNote s = outputMessage (JSON.note s) $ "(" ++ s ++ ") "
@ -166,7 +166,7 @@ showFullJSON v = withOutputType $ liftIO . go
-}
showCustom :: String -> Annex Bool -> Annex ()
showCustom command a = do
outputMessage (JSON.start command Nothing) ""
outputMessage (JSON.start command Nothing Nothing) ""
r <- a
outputMessage (JSON.end r) ""