update

2 files changed, 17 insertions, 6 deletions

diff --git a/Commands.hs b/Commands.hs
index ffa3576cf..8c9dca9ad 100644
--- a/Commands.hs
+++ b/Commands.hs
@@ -86,7 +86,7 @@ usage = usageInfo header options ++ "\nSubcommands:\n" ++ cmddescs
 		indent l = "  " ++ l
 		pad n s = take (n - (length s)) $ repeat ' '
 
-{- Generate descrioptions of wanted parameters for subcommands. -}
+{- Generate descriptions of wanted parameters for subcommands. -}
 descWanted :: CmdWants -> String
 descWanted Description = "DESCRIPTION"
 descWanted _ = "PATH ..."
@@ -187,7 +187,10 @@ getCmd file = isAnnexed file $ \(key, backend) -> do
 		then return ()
 		else do
 			showStart "get" file
-			getViaTmp key (Backend.retrieveKeyFile backend key)
+			ok <- getViaTmp key (Backend.retrieveKeyFile backend key)
+			if (ok)
+				then showEndOk
+				else showEndFail
 
 {- Indicates a file's content is not wanted anymore, and should be removed
  - if it's safe to do so. -}
@@ -315,7 +318,15 @@ moveTo file = isAnnexed file $ \(key, backend) -> do
 			Remotes.copyToRemote remote key
 			removeit remote key
 		removeit remote key = do
-			error $ "TODO remove" ++ file
+			error "TODO: drop key from local"
+			-- Update local location log; key is present
+			-- there and missing here.
+			logStatus key ValueMissing
+			u <- getUUID remote
+			liftIO $ logChange remote key u ValuePresent
+			-- Propigate location log to remote.
+			error "TODO: update remote locationlog"
+			showEndOk
 
 {- Moves the content of an annexed file from another repository to the current
  - repository and updates locationlog information on both.
diff --git a/Core.hs b/Core.hs
index acb4489c8..1d887792a 100644
--- a/Core.hs
+++ b/Core.hs
@@ -97,7 +97,7 @@ logStatus key status = do
 {- Runs an action, passing it a temporary filename to download,
  - and if the action succeeds, moves the temp file into 
  - the annex as a key's content. -}
-getViaTmp :: Key -> (FilePath -> Annex (Bool)) -> Annex ()
+getViaTmp :: Key -> (FilePath -> Annex Bool) -> Annex Bool
 getViaTmp key action = do
 	g <- Annex.gitRepo
 	let dest = annexLocation g key
@@ -108,9 +108,9 @@ getViaTmp key action = do
 		then do
 			liftIO $ renameFile tmp dest
 			logStatus key ValuePresent
-			showEndOk
+			return True
 		else do
-			showEndFail
+			return False
 
 {- Output logging -}
 showStart :: String -> String -> Annex ()