git-annex-shell mostly done now, only needs 2 more subcommands

6 files changed, 130 insertions, 55 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
diff --git a/Command/ConfigList.hs b/Command/ConfigList.hs
new file mode 100644
index 000000000..0d9d789b5
--- /dev/null
+++ b/Command/ConfigList.hs
@@ -0,0 +1,27 @@
+{- git-annex command
+ -
+ - Copyright 2010 Joey Hess <joey@kitenet.net>
+ -
+ - Licensed under the GNU GPL version 3 or higher.
+ -}
+
+module Command.ConfigList where
+
+import Control.Monad.State (liftIO)
+
+import Annex
+import Command
+import qualified GitRepo as Git
+
+command :: [Command]
+command = [Command "configlist" paramNothing seek
+		"outputs relevant git configuration"]
+
+seek :: [CommandSeek]
+seek = [withNothing start]
+
+start :: CommandStartNothing
+start = do
+	g <- Annex.gitRepo
+	liftIO $ Git.run g ["config", "--list"]
+	return Nothing
diff --git a/Command/InAnnex.hs b/Command/InAnnex.hs
new file mode 100644
index 000000000..d49539513
--- /dev/null
+++ b/Command/InAnnex.hs
@@ -0,0 +1,32 @@
+{- git-annex command
+ -
+ - Copyright 2010 Joey Hess <joey@kitenet.net>
+ -
+ - Licensed under the GNU GPL version 3 or higher.
+ -}
+
+module Command.InAnnex where
+
+import Control.Monad.State (liftIO)
+import System.Exit
+
+import Command
+import Types
+import Core
+import qualified Backend
+
+command :: [Command]
+command = [Command "inannex" (paramRepeating paramKey) seek
+		"checks if keys are present in the annex"]
+
+seek :: [CommandSeek]
+seek = [withKeys start]
+
+start :: CommandStartString
+start keyname = do
+	backends <- Backend.list
+	let key = genKey (head backends) keyname
+	present <- inAnnex key
+	if present
+		then return Nothing
+		else liftIO $ exitFailure
diff --git a/doc/git-annex-shell.mdwn b/doc/git-annex-shell.mdwn
index 34d9c8afe..9f51b6813 100644
--- a/doc/git-annex-shell.mdwn
+++ b/doc/git-annex-shell.mdwn
@@ -4,43 +4,37 @@ git-annex-shell - Restricted login shell for git-annex only SSH access
 
 # SYNOPSIS
 
-git-annex-shell -c command [params ...]
+git-annex-shell [-c] command [params ...]
 
 # DESCRIPTION
 
-git-annex-shell is a restricted shell, similar to git-shell, which 
-can be used as a login shell for SSH accounts you want to restrict.
+git-annex-shell is a restricted shell, similar to git-shell, which
+can be used as a login shell for SSH accounts.
 
 # COMMANDS
 
-* git-annex fromkey file
+* configlist directory
 
-  This can be used to maually set up a file to link to a specified key
-  in the key-value backend. How you determine an existing key in the backend
-  varies. For the URL backend, the key is just a URL to the content.
+  This outputs the git configuration, in the same form as
+  `git config --list`
 
-  Example:
+* inannex directory [key ...]
 
-	git annex fromkey --backend=URL --key=http://www.archive.org/somefile somefile
+  This checks if all specified keys are present in the annex, 
+  and exits zero if so.
 
-* git-annex dropkey [key ...]
+* dropkey directory [key ...]
 
-  This drops the annexed data for the specified
-  keys from this repository.
+  This drops the annexed data for the specified keys.
 
-  This can be used to drop content for arbitrary keys, which do not need
-  to have a file in the git repository pointing at them.
+* recvkey directory key
 
-  A backend will typically need to be specified with --backend. If none
-  is specified, the first configured backend is used.
+  This runs rsync in server mode to receive the content of a key,
+  and stores the content in the annex.
 
-* git-annex setkey file
+* sendkey directory key
 
-  This sets the annxed data for a key to the content of
-  the specified file, and then removes the file.
-
-  A backend will typically need to be specified with --backend. If none
-  is specified, the first configured backend is used.
+  This runs rsync in server mode to transfer out the content of a key.
 
 Any other command is passed through to git-shell.
 
diff --git a/git-annex-shell.hs b/git-annex-shell.hs
index 7adb5e790..492d18446 100644
--- a/git-annex-shell.hs
+++ b/git-annex-shell.hs
@@ -5,48 +5,68 @@
  - Licensed under the GNU GPL version 3 or higher.
  -}
 
-import System.Console.GetOpt
 import System.Environment
 import Control.Monad (when)
 
+import qualified GitRepo as Git
 import CmdLine
 import Command
 import Utility
 import Options
 
-import qualified Command.FromKey
+import qualified Command.ConfigList
+import qualified Command.InAnnex
 import qualified Command.DropKey
-import qualified Command.SetKey
+--import qualified Command.RecvKey
+--import qualified Command.SendKey
 
 cmds :: [Command]
-cmds = concat
-	[ Command.FromKey.command
+cmds = map adddirparam $ concat
+	[ Command.ConfigList.command
+	, Command.InAnnex.command
 	, Command.DropKey.command
-	, Command.SetKey.command
+--	, Command.RecvKey.command
+--	, Command.SendKey.command
 	]
-
-options :: [Option]
-options = [ Option ['c'] ["command"] (NoArg (storeOptBool "command" True))
-		"ignored for compatability with git-shell"
-	  ] ++ commonOptions
+	where
+		adddirparam c = c { cmdparams = "DIRECTORY " ++ cmdparams c }
 
 header :: String
-header = "Usage:\n" ++
-	"\tgit-annex-shell -c git-annex command [option ..]\n" ++
-	"\tgit-annex-shell -c shellcommand argument"
+header = "Usage: git-annex-shell [-c] command [option ..]"
 
 main :: IO ()
 main = do
 	args <- getArgs
-	-- dispatch git-annex commands to builtin versions,
-	-- and pass everything else to git-shell
-	case args of
-		("git-annex":as) -> builtin as
-		[] -> builtin []
-		_ -> external args
-	where
-		builtin l = dispatch l cmds options header
-		external l = do
-			ret <- boolSystem "git-shell" l
-			when (not ret) $
-				error "git-shell failed"
+	main' args
+
+main' :: [String] -> IO ()
+main' [] = failure
+-- skip leading -c options, passed by eg, ssh
+main' ("-c":p) = main' p
+-- Since git-annex explicitly runs git-annex-shell, we will be passed 
+-- a redundant "git-annex-shell" parameter when we're the user's login shell.
+main' ("git-annex-shell":p) = main' p
+-- a command can be either a builtin or something to pass to git-shell
+main' c@(cmd:dir:params)
+	| elem cmd builtins = builtin cmd dir params
+	| otherwise = external c
+main' c@(cmd:_)
+	| elem cmd builtins = failure
+	| otherwise = external c
+
+builtins :: [String]
+builtins = map cmdname cmds
+
+builtin :: String -> String -> [String] -> IO ()
+builtin cmd dir params = do
+	let gitrepo = Git.repoFromPath dir
+	dispatch gitrepo (cmd:params) cmds commonOptions header
+
+external :: [String] -> IO ()
+external l = do
+	ret <- boolSystem "git-shell" ("-c":l)
+	when (not ret) $
+		error "git-shell failed"
+
+failure :: IO ()
+failure = error $ "bad parameters\n\n" ++ usage header cmds commonOptions
diff --git a/git-annex.hs b/git-annex.hs
index 6c143972a..110054fd5 100644
--- a/git-annex.hs
+++ b/git-annex.hs
@@ -7,6 +7,7 @@
 
 import System.Environment
 
+import qualified GitRepo as Git
 import CmdLine
 import Command
 import Options
@@ -58,7 +59,11 @@ cmds = concat
 	, Command.Find.command
 	]
 
+header :: String
+header = "Usage: git-annex command [option ..]"
+
 main :: IO ()
 main = do
 	args <- getArgs
-	dispatch args cmds commonOptions "Usage: git-annex command [option ..]"
+	gitrepo <- Git.repoFromCwd
+	dispatch gitrepo args cmds commonOptions header