refactor in preparation for adding a git-annex-shell command

1 files changed, 73 insertions, 1 deletions

diff --git a/git-annex.hs b/git-annex.hs
index 1173ab913..31d90e4fc 100644
--- a/git-annex.hs
+++ b/git-annex.hs
@@ -6,6 +6,7 @@
  -}
 
 import System.Environment
+import System.Console.GetOpt
 
 import qualified Annex
 import Core
@@ -14,10 +15,81 @@ import CmdLine
 import qualified GitRepo as Git
 import BackendList
 
+import Command
+import qualified Command.Add
+import qualified Command.Unannex
+import qualified Command.Drop
+import qualified Command.Move
+import qualified Command.Copy
+import qualified Command.Get
+import qualified Command.FromKey
+import qualified Command.DropKey
+import qualified Command.SetKey
+import qualified Command.Fix
+import qualified Command.Init
+import qualified Command.Fsck
+import qualified Command.Unused
+import qualified Command.DropUnused
+import qualified Command.Unlock
+import qualified Command.Lock
+import qualified Command.PreCommit
+import qualified Command.Find
+import qualified Command.Uninit
+import qualified Command.Trust
+import qualified Command.Untrust
+
+cmds :: [Command]
+cmds = concat
+	[ Command.Add.command
+	, Command.Get.command
+	, Command.Drop.command
+	, Command.Move.command
+	, Command.Copy.command
+	, Command.Unlock.command
+	, Command.Lock.command
+	, Command.Init.command
+	, Command.Unannex.command
+	, Command.Uninit.command
+	, Command.PreCommit.command
+	, Command.Trust.command
+	, Command.Untrust.command
+	, Command.FromKey.command
+	, Command.DropKey.command
+	, Command.SetKey.command
+	, Command.Fix.command
+	, Command.Fsck.command
+	, Command.Unused.command
+	, Command.DropUnused.command
+	, Command.Find.command
+	]
+
+options :: [Option]
+options = [
+	    Option ['f'] ["force"] (NoArg (storeOptBool "force" True))
+		"allow actions that may lose annexed data"
+	  , Option ['q'] ["quiet"] (NoArg (storeOptBool "quiet" True))
+		"avoid verbose output"
+	  , Option ['v'] ["verbose"] (NoArg (storeOptBool "quiet" False))
+		"allow verbose output"
+	  , Option ['b'] ["backend"] (ReqArg (storeOptString "backend") paramName)
+		"specify default key-value backend to use"
+	  , Option ['k'] ["key"] (ReqArg (storeOptString "key") paramKey)
+		"specify a key to use"
+	  , Option ['t'] ["to"] (ReqArg (storeOptString "torepository") paramRemote)
+		"specify to where to transfer content"
+	  , Option ['f'] ["from"] (ReqArg (storeOptString "fromrepository") paramRemote)
+		"specify from where to transfer content"
+	  , Option ['x'] ["exclude"] (ReqArg (storeOptString "exclude") paramGlob)
+		"skip files matching the glob pattern"
+	  ]
+
+header :: String
+header = "Usage: git-annex subcommand [option ..]"
+
 main :: IO ()
 main = do
 	args <- getArgs
 	gitrepo <- Git.repoFromCwd
 	state <- Annex.new gitrepo allBackends
-	(actions, state') <- Annex.run state $ parseCmd args
+	(actions, state') <- Annex.run state $ parseCmd args header cmds options
 	tryRun state' $ [startup, upgrade] ++ actions