fixed dropkey, setkey, and git-annex-shell subcommands

key is now specified as the full key, no --backend needed

4 files changed, 11 insertions, 38 deletions

diff --git a/Command/DropKey.hs b/Command/DropKey.hs
index f0450eea3..419d9caa4 100644
--- a/Command/DropKey.hs
+++ b/Command/DropKey.hs
@@ -14,6 +14,7 @@ import LocationLog
 import Types
 import Content
 import Messages
+import Key
 
 command :: [Command]
 command = [Command "dropkey" (paramRepeating paramKey) seek
@@ -22,21 +23,16 @@ command = [Command "dropkey" (paramRepeating paramKey) seek
 seek :: [CommandSeek]
 seek = [withKeys start]
 
-{- Drops cached content for a key. -}
-start :: CommandStartString
-start keyname = do
-	backends <- Backend.list
-	let key = error "fixme!!"
-	--let key = genKey (head backends) keyname --TODO FIXME
-	let present  = error "fixme!!"
-	--present <- inAnnex key
+start :: CommandStartKey
+start key = do
+	present <- inAnnex key
 	force <- Annex.getState Annex.force
 	if not present
 		then return Nothing
 		else if not force
 			then error "dropkey is can cause data loss; use --force if you're sure you want to do this"
 			else do
-				showStart "dropkey" keyname
+				showStart "dropkey" (show key)
 				return $ Just $ perform key
 
 perform :: Key -> CommandPerform
diff --git a/Command/InAnnex.hs b/Command/InAnnex.hs
index a2beda4a5..fa81fc9a4 100644
--- a/Command/InAnnex.hs
+++ b/Command/InAnnex.hs
@@ -12,9 +12,6 @@ import System.Exit
 
 import Command
 import Content
-import qualified Backend
-import qualified BackendClass
-import Key
 
 command :: [Command]
 command = [Command "inannex" (paramRepeating paramKey) seek
@@ -23,14 +20,8 @@ command = [Command "inannex" (paramRepeating paramKey) seek
 seek :: [CommandSeek]
 seek = [withKeys start]
 
-start :: CommandStartString
-start keyname = do
-	backends <- Backend.list
-	let key = stubKey {
-		keyName = keyname,
-		keyBackendName = BackendClass.name (head backends)
-	}
-	error "BROKEN. fixme!"
+start :: CommandStartKey
+start key = do
 	present <- inAnnex key
 	if present
 		then return Nothing
diff --git a/Command/RecvKey.hs b/Command/RecvKey.hs
index 488bab62d..c7c37d1e3 100644
--- a/Command/RecvKey.hs
+++ b/Command/RecvKey.hs
@@ -12,10 +12,8 @@ import Control.Monad.State (liftIO)
 import System.Exit
 
 import Command
-import Types
 import CmdLine
 import Content
-import qualified Backend
 import RsyncFile
 
 command :: [Command]
@@ -25,12 +23,8 @@ command = [Command "recvkey" paramKey seek
 seek :: [CommandSeek]
 seek = [withKeys start]
 
-start :: CommandStartString
-start keyname = do
-	error "BROKEN FIXME!"
-	{-
-	backends <- Backend.list
-	let key = genKey (head backends) keyname
+start :: CommandStartKey
+start key = do
 	present <- inAnnex key
 	when present $
 		error "key is already present in annex"
@@ -43,4 +37,3 @@ start keyname = do
 			_ <- shutdown
 			liftIO exitSuccess
 		else liftIO exitFailure
-	-}
diff --git a/Command/SendKey.hs b/Command/SendKey.hs
index ff269f21f..56974bda9 100644
--- a/Command/SendKey.hs
+++ b/Command/SendKey.hs
@@ -14,9 +14,7 @@ import System.Exit
 import Locations
 import qualified Annex
 import Command
-import Types
 import Content
-import qualified Backend
 import RsyncFile
 
 command :: [Command]
@@ -26,16 +24,11 @@ command = [Command "sendkey" paramKey seek
 seek :: [CommandSeek]
 seek = [withKeys start]
 
-start :: CommandStartString
-start keyname = do
-	error "BROKEN FIXME!"
-	{-
-	backends <- Backend.list
-	let key = genKey (head backends) keyname
+start :: CommandStartKey
+start key = do
 	present <- inAnnex key
 	g <- Annex.gitRepo
 	let file = gitAnnexLocation g key
 	when present $
 		liftIO $ rsyncServerSend file
 	liftIO exitFailure
-	-}