summaryrefslogtreecommitdiff
path: root/CmdLine
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-07-09 10:41:17 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-07-09 10:42:28 -0400
commit98769639f3fc88a8dbe497180145536caf51df5c (patch)
tree9c488f3ebb8584d5f09df34774ec55448a07da39 /CmdLine
parent2fe6252a14ffa7f8dc385c95da901fc64bdc1b6f (diff)
formatting
Diffstat (limited to 'CmdLine')
-rw-r--r--CmdLine/GitAnnex.hs8
-rw-r--r--CmdLine/GitAnnex/Options.hs12
2 files changed, 10 insertions, 10 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"
)