1 files changed, 33 insertions, 22 deletions
diff --git a/Command/Add.hs b/Command/Add.hs
index 2c671eea2..ccdff67ec 100644
--- a/Command/Add.hs
+++ b/Command/Add.hs
@@ -50,34 +50,40 @@ start file = notBareRepo $ ifAnnexed file fixup add
  - to prevent it from being modified in between. It's hard linked into a
  - temporary location, and its writable bits are removed. It could still be
  - written to by a process that already has it open for writing. -}
-perform :: FilePath -> CommandPerform
-perform file = do
+lockDown :: FilePath -> Annex FilePath
+lockDown file = do
 	liftIO $ preventWrite file
 	tmp <- fromRepo gitAnnexTmpDir
 	createAnnexDirectory tmp
 	pid <- liftIO getProcessID
 	let tmpfile = tmp </> "add" ++ show pid ++ "." ++ takeFileName file
-	nuke tmpfile
+	liftIO $ nukeFile tmpfile
 	liftIO $ createLink file tmpfile
+	return tmpfile
+
+{- Moves the file into the annex. -}
+ingest :: FilePath -> Annex (Maybe Key)
+ingest file = do
+	tmpfile <- lockDown file
 	let source = KeySource { keyFilename = file, contentLocation = tmpfile }
 	backend <- chooseBackend file
 	genKey source backend >>= go tmpfile
 	where
-		go _ Nothing = stop
+		go _ Nothing = return Nothing
 		go tmpfile (Just (key, _)) = do
 			handle (undo file key) $ moveAnnex key tmpfile
-			nuke file
-			next $ cleanup file key True
+			liftIO $ nukeFile file
+			return $ Just key
 
-nuke :: FilePath -> Annex ()
-nuke file = liftIO $ whenM (doesFileExist file) $ removeFile file
+perform :: FilePath -> CommandPerform
+perform file = maybe stop (\key -> next $ cleanup file key True) =<< ingest file
 
 {- On error, put the file back so it doesn't seem to have vanished.
  - This can be called before or after the symlink is in place. -}
 undo :: FilePath -> Key -> IOException -> Annex a
 undo file key e = do
 	whenM (inAnnex key) $ do
-		nuke file
+		liftIO $ nukeFile file
 		handle tryharder $ fromAnnex key file
 		logStatus key InfoMissing
 	throw e
@@ -88,24 +94,29 @@ undo file key e = do
 			src <- inRepo $ gitAnnexLocation key
 			liftIO $ moveFile src file
 
-cleanup :: FilePath -> Key -> Bool -> CommandCleanup
-cleanup file key hascontent = do
-	handle (undo file key) $ do
-		link <- calcGitLink file key
-		liftIO $ createSymbolicLink link file
+{- Creates the symlink to the annexed content. -}
+link :: FilePath -> Key -> Bool -> Annex ()
+link file key hascontent = handle (undo file key) $ do
+	l <- calcGitLink file key
+	liftIO $ createSymbolicLink l file
 
-		when hascontent $ do
-			logStatus key InfoPresent
+	when hascontent $ do
+		logStatus key InfoPresent
 	
-			-- touch the symlink to have the same mtime as the
-			-- file it points to
-			liftIO $ do
-				mtime <- modificationTime <$> getFileStatus file
-				touch file (TimeSpec mtime) False
+		-- touch the symlink to have the same mtime as the
+		-- file it points to
+		liftIO $ do
+			mtime <- modificationTime <$> getFileStatus file
+			touch file (TimeSpec mtime) False
 
+{- Note: Several other commands call this, and expect it to 
+ - create the symlink and add it. -}
+cleanup :: FilePath -> Key -> Bool -> CommandCleanup
+cleanup file key hascontent = do
+	_ <- link file key hascontent
 	params <- ifM (Annex.getState Annex.force)
 		( return [Param "-f"]
 		, return []
 		)
-	Annex.Queue.add "add" (params++[Param "--"]) [file]
+	Annex.Queue.addCommand "add" (params++[Param "--"]) [file]
 	return True