Remove --json option from commands not supporting it.

This commit is contained in:
Joey Hess 2014-01-18 11:54:43 -04:00
parent dce9faf6e4
commit 1d90e72e91
6 changed files with 19 additions and 6 deletions

View file

@ -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"]

View file

@ -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

View file

@ -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
SectionQuery "shows general information about the annex"]
def = [noCommit $ withOptions [jsonOption] $
command "info" paramPaths seek SectionQuery
"shows general information about the annex"]
seek :: [CommandSeek]
seek = [withWords start]