didn't quite get removeDirect right before, this passes test suite

2 files changed, 19 insertions, 8 deletions

diff --git a/Annex/Content/Direct.hs b/Annex/Content/Direct.hs
index 91073f687..ef2573c34 100644
--- a/Annex/Content/Direct.hs
+++ b/Annex/Content/Direct.hs
@@ -8,6 +8,7 @@
 module Annex.Content.Direct (
 	associatedFiles,
 	removeAssociatedFile,
+	removeAssociatedFileUnchecked,
 	addAssociatedFile,
 	goodContent,
 	recordedInodeCache,
@@ -73,15 +74,22 @@ changeAssociatedFiles key transform = do
  		hPutStr h content
 		hClose h
 
-{- Removes an associated file. Returns new associatedFiles value. -}
+{- Removes an associated file. Returns new associatedFiles value.
+ - Checks if this was the last copy of the object, and updates location
+ - log. -}
 removeAssociatedFile :: Key -> FilePath -> Annex [FilePath]
 removeAssociatedFile key file = do
-	file' <- normaliseAssociatedFile file
-	fs <- changeAssociatedFiles key $ filter (/= file')
+	fs <- removeAssociatedFileUnchecked key file
 	when (null fs) $
 		logStatus key InfoMissing
 	return fs
 
+{- Removes an associated file. Returns new associatedFiles value. -}
+removeAssociatedFileUnchecked :: Key -> FilePath -> Annex [FilePath]
+removeAssociatedFileUnchecked key file = do
+	file' <- normaliseAssociatedFile file
+	changeAssociatedFiles key $ filter (/= file')
+
 {- Adds an associated file. Returns new associatedFiles value. -}
 addAssociatedFile :: Key -> FilePath -> Annex [FilePath]
 addAssociatedFile key file = do
diff --git a/Annex/Direct.hs b/Annex/Direct.hs
index 6d9f3e31d..962c7595c 100644
--- a/Annex/Direct.hs
+++ b/Annex/Direct.hs
@@ -203,13 +203,16 @@ toDirectGen k f = do
 					liftIO . void . copyFileExternal loc
 			_ -> return Nothing
 
-{- Removes a direct mode file, while retaining its content in the annex. -}
+{- Removes a direct mode file, while retaining its content in the annex
+ - (unless its content has already been changed). -}
 removeDirect :: Key -> FilePath -> Annex ()
 removeDirect k f = do
-	otherlocs <- removeAssociatedFile k f
-	unless (null otherlocs) $
-		unlessM (inAnnex k) $
-			moveAnnex k f
+	void $ removeAssociatedFileUnchecked k f
+	unlessM (inAnnex k) $
+		ifM (goodContent k f)
+			( moveAnnex k f
+			, logStatus k InfoMissing
+			)
 	liftIO $ do
 		nukeFile f
 		void $ tryIO $ removeDirectory $ parentDir f