Remove --json option from commands not supporting it.

Command/ExamineKey.hs

@@ -12,9 +12,10 @@ import Command
 import qualified Utility.Format
 import Command.Find (formatOption, withFormat, showFormatted, keyVars)
 import Types.Key
+import GitAnnex.Options
 
 def :: [Command]
-def = [noCommit $ noMessages $ withOptions [formatOption] $
+def = [noCommit $ noMessages $ withOptions [formatOption, jsonOption] $
 	command "examinekey" (paramRepeating paramKey) seek
 	SectionPlumbing "prints information from a key"]
 

Command/Find.hs

@@ -18,9 +18,10 @@ import qualified Utility.Format
 import Utility.DataUnits
 import Types.Key
 import qualified Option
+import GitAnnex.Options
 
 def :: [Command]
-def = [noCommit $ noMessages $ withOptions [formatOption, print0Option] $
+def = [noCommit $ noMessages $ withOptions [formatOption, print0Option, jsonOption] $
 	command "find" paramPaths seek SectionQuery "lists available files"]
 
 formatOption :: Option

Command/Info.hs

@@ -21,6 +21,7 @@ import qualified Remote
 import qualified Command.Unused
 import qualified Git
 import qualified Annex
+import GitAnnex.Options
 import Command
 import Utility.DataUnits
 import Utility.DiskFree
@@ -70,8 +71,9 @@ data StatInfo = StatInfo
 type StatState = StateT StatInfo Annex
 
 def :: [Command]
-def = [noCommit $ command "info" paramPaths seek
+def = [noCommit $ withOptions [jsonOption] $
-	SectionQuery "shows general information about the annex"]
+	command "info" paramPaths seek SectionQuery
+	"shows general information about the annex"]
 
 seek :: [CommandSeek]
 seek = [withWords start]

GitAnnex/Options.hs

@@ -14,6 +14,7 @@ import qualified Git.Config
 import Git.Types
 import Command
 import Types.TrustLevel
+import Types.Messages
 import qualified Annex
 import qualified Remote
 import qualified Limit
@@ -85,3 +86,7 @@ toOption = Option.field ['t'] "to" paramRemote "destination remote"
 
 fromToOptions :: [Option]
 fromToOptions = [fromOption, toOption]
+
+jsonOption :: Option
+jsonOption = Option ['j'] ["json"] (NoArg (Annex.setOutput JSONOutput))
+	"enable JSON output"

Option.hs

@@ -35,8 +35,6 @@ common =
 		"avoid verbose output"
 	, Option ['v'] ["verbose"] (NoArg (Annex.setOutput NormalOutput))
 		"allow verbose output (default)"
-	, Option ['j'] ["json"] (NoArg (Annex.setOutput JSONOutput))
-		"enable JSON output"
 	, Option ['d'] ["debug"] (NoArg setdebug)
 		"show debug messages"
 	, Option [] ["no-debug"] (NoArg unsetdebug)

debian/changelog

@@ -1,3 +1,9 @@
+git-annex (5.20140118) UNRELEASED; urgency=medium
+
+  * Remove --json option from commands not supporting it.
+
+ -- Joey Hess <joeyh@debian.org>  Sat, 18 Jan 2014 11:54:17 -0400
+
 git-annex (5.20140117) unstable; urgency=medium
 
   * Really fix FTBFS on mipsel and sparc due to test suite not being available