diff options
| -rw-r--r-- | CmdLine/GitAnnex.hs | 8 | ||||
| -rw-r--r-- | CmdLine/GitAnnex/Options.hs | 12 | ||||
| -rw-r--r-- | Command/Drop.hs | 6 | ||||
| -rw-r--r-- | Command/Fsck.hs | 13 |
4 files changed, 16 insertions, 23 deletions
diff --git a/CmdLine/GitAnnex.hs b/CmdLine/GitAnnex.hs index 8967bc471..80ee876ff 100644 --- a/CmdLine/GitAnnex.hs +++ b/CmdLine/GitAnnex.hs @@ -17,6 +17,8 @@ import Annex.Ssh import qualified Command.Add import qualified Command.Unannex +import qualified Command.Fsck +{- import qualified Command.Drop import qualified Command.Move import qualified Command.Copy @@ -46,7 +48,6 @@ import qualified Command.Init import qualified Command.Describe import qualified Command.InitRemote import qualified Command.EnableRemote -import qualified Command.Fsck import qualified Command.Expire import qualified Command.Repair import qualified Command.Unused @@ -116,10 +117,13 @@ import qualified Command.TestRemote #ifdef WITH_EKG import System.Remote.Monitoring #endif +-} cmds :: [Command] cmds = [ Command.Add.cmd + , Command.Fsck.cmd +{- , Command.Get.cmd , Command.Drop.cmd , Command.Move.cmd @@ -176,7 +180,6 @@ cmds = , Command.VPop.cmd , Command.VCycle.cmd , Command.Fix.cmd - , Command.Fsck.cmd , Command.Expire.cmd , Command.Repair.cmd , Command.Unused.cmd @@ -218,6 +221,7 @@ cmds = , Command.FuzzTest.cmd , Command.TestRemote.cmd #endif +-} ] header :: String diff --git a/CmdLine/GitAnnex/Options.hs b/CmdLine/GitAnnex/Options.hs index 51c222d7d..f95ab08ff 100644 --- a/CmdLine/GitAnnex/Options.hs +++ b/CmdLine/GitAnnex/Options.hs @@ -71,23 +71,20 @@ parseKeyOptions allowincomplete = KeyOptions parseAllKeysOption :: Parser Bool parseAllKeysOption = switch - ( long "all" - <> short 'A' + ( long "all" <> short 'A' <> help "operate on all versions of all files" ) parseUnusedKeysOption :: Parser Bool parseUnusedKeysOption = switch - ( long "unused" - <> short 'U' + ( long "unused" <> short 'U' <> help "operate on files found by last run of git-annex unused" ) parseSpecificKeyOption :: Parser (Maybe Key) parseSpecificKeyOption = optional $ option (str >>= parseKey) - ( long "key" + ( long "key" <> metavar paramKey <> help "operate on specified key" - <> metavar paramKey ) parseKey :: Monad m => String -> m Key @@ -193,8 +190,7 @@ autoOption = flagOption ['a'] "auto" "automatic mode" parseAutoOption :: Parser Bool parseAutoOption = switch - ( long "auto" - <> short 'a' + ( long "auto" <> short 'a' <> help "automatic mode" ) diff --git a/Command/Drop.hs b/Command/Drop.hs index e246af342..3f4ea1a9d 100644 --- a/Command/Drop.hs +++ b/Command/Drop.hs @@ -47,10 +47,8 @@ optParser desc = DropOptions parseDropFromOption :: Parser (Maybe RemoteName) parseDropFromOption = optional $ strOption - ( long "from" - <> short 'f' - <> metavar paramRemote - <> help "drop content from a remote" + ( long "from" <> short 'f' <> metavar paramRemote + <> help "drop content from a remote" ) seek :: DropOptions -> CommandSeek diff --git a/Command/Fsck.hs b/Command/Fsck.hs index 885ce17dd..5350a63eb 100644 --- a/Command/Fsck.hs +++ b/Command/Fsck.hs @@ -60,24 +60,19 @@ optParser :: CmdParamsDesc -> Parser FsckOptions optParser desc = FsckOptions <$> cmdParams desc <*> optional (strOption - ( long "from" - <> short 'f' - <> metavar paramRemote + ( long "from" <> short 'f' <> metavar paramRemote <> help "check remote" )) <*> switch - ( long "incremental" - <> short 'S' + ( long "incremental" <> short 'S' <> help "start an incremental fsck" ) <*> switch - ( long "more" - <> short 'm' + ( long "more" <> short 'm' <> help "continue an incremental fsck" ) <*> optional (option (str >>= parseDuration) - ( long "incremental-schedule" - <> metavar paramTime + ( long "incremental-schedule" <> metavar paramTime <> help "schedule incremental fscking" )) <*> parseKeyOptions False |