summaryrefslogtreecommitdiff
path: root/CmdLine.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2010-12-30 20:08:22 -0400
committerGravatar Joey Hess <joey@kitenet.net>2010-12-30 20:08:22 -0400
commita5a302b77d816b189ae5ae55f03b18d2cf6ef45b (patch)
tree9517a921df12f9addcf9c0284969867ed5b9c35c /CmdLine.hs
parent7a52b34e0631609d5d862c3ba100cc499b30b5fa (diff)
git-annex-shell mostly done now, only needs 2 more subcommands
Diffstat (limited to 'CmdLine.hs')
-rw-r--r--CmdLine.hs9
1 files changed, 3 insertions, 6 deletions
diff --git a/CmdLine.hs b/CmdLine.hs
index 34cc22656..fbcfb6405 100644
--- a/CmdLine.hs
+++ b/CmdLine.hs
@@ -8,9 +8,7 @@
module CmdLine (
dispatch,
parseCmd,
- Option,
- storeOptBool,
- storeOptString,
+ usage,
) where
import System.Console.GetOpt
@@ -27,9 +25,8 @@ import Upgrade
import Options
{- Runs the passed command line. -}
-dispatch :: [String] -> [Command] -> [Option] -> String -> IO ()
-dispatch args cmds options header = do
- gitrepo <- Git.repoFromCwd
+dispatch :: Git.Repo -> [String] -> [Command] -> [Option] -> String -> IO ()
+dispatch gitrepo args cmds options header = do
state <- Annex.new gitrepo allBackends
(actions, state') <- Annex.run state $ parseCmd args header cmds options
tryRun state' $ [startup, upgrade] ++ actions