summaryrefslogtreecommitdiff
path: root/Options.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-09-01 15:16:31 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-09-01 15:22:06 -0400
commit2f4d4d1c4552a93a5f26a8a0a713e3916612329e (patch)
treea75ee41d85fc2c49ce8adf26a8c22e4f6ed6b944 /Options.hs
parent57dd34c6be5dbc01286108fd943ff9e02956e8aa (diff)
basic json support
This includes a generic JSONStream library built on top of Text.JSON (somewhat hackishly). It would be possible to stream out a single json document describing all actions, but it's probably better for consumers if they can expect one json document per line, so I did it that way instead. Output from external programs used for transferring files is not currently hidden when outputting json, which probably makes it not very useful there. This may be dealt with if there is demand for json output for --get or --move to be parsable. The version, status, and find subcommands have hand-crafted output and don't do json. The whereis subcommand needs to be modified to produce useful json.
Diffstat (limited to 'Options.hs')
-rw-r--r--Options.hs2
1 files changed, 2 insertions, 0 deletions
diff --git a/Options.hs b/Options.hs
index 768a1c289..e0ca48c01 100644
--- a/Options.hs
+++ b/Options.hs
@@ -30,6 +30,8 @@ commonOptions =
"avoid verbose output"
, Option ['v'] ["verbose"] (NoArg (setoutput Annex.NormalOutput))
"allow verbose output (default)"
+ , Option ['j'] ["json"] (NoArg (setoutput Annex.JSONOutput))
+ "enable JSON output"
, Option ['d'] ["debug"] (NoArg (setdebug))
"show debug messages"
, Option ['b'] ["backend"] (ReqArg setforcebackend paramName)