diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-03-06 12:56:39 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-03-06 12:57:24 -0400 |
| commit | bc6c152e48af37fa570b2ebf0352b1b1206eaecd (patch) | |
| tree | 67d7cc0f39a8010e8aca5acc7ee30ff7d8b6e47f /Messages.hs | |
| parent | 9c80035727bddc2af69fb9cab41dbf965fe496ec (diff) | |
improve json when showStart' is given only a key
Before, the json contained file:key; change that to key:
If a file and a key are given, inclue both file: and key:
Diffstat (limited to 'Messages.hs')
| -rw-r--r-- | Messages.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Messages.hs b/Messages.hs index 8d8f916ce..57541cfc0 100644 --- a/Messages.hs +++ b/Messages.hs @@ -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) "" |