diff options
| -rw-r--r-- | Command/ExamineKey.hs | 3 | ||||
| -rw-r--r-- | Command/Find.hs | 3 | ||||
| -rw-r--r-- | Command/Info.hs | 6 | ||||
| -rw-r--r-- | GitAnnex/Options.hs | 5 | ||||
| -rw-r--r-- | Option.hs | 2 | ||||
| -rw-r--r-- | debian/changelog | 6 |
6 files changed, 19 insertions, 6 deletions
diff --git a/Command/ExamineKey.hs b/Command/ExamineKey.hs index 7dfdadd3d..1e8e2cecf 100644 --- a/Command/ExamineKey.hs +++ b/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"] diff --git a/Command/Find.hs b/Command/Find.hs index 0591e657e..ddcc4b8c7 100644 --- a/Command/Find.hs +++ b/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 diff --git a/Command/Info.hs b/Command/Info.hs index d465f2d84..7a9ec15dc 100644 --- a/Command/Info.hs +++ b/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 - 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] diff --git a/GitAnnex/Options.hs b/GitAnnex/Options.hs index 88fad948a..45b9539e0 100644 --- a/GitAnnex/Options.hs +++ b/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" @@ -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) diff --git a/debian/changelog b/debian/changelog index e1853da5b..3dac77151 100644 --- a/debian/changelog +++ b/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 |