make copy --to check preferred content of the remote

1 files changed, 10 insertions, 25 deletions

diff --git a/Command/Drop.hs b/Command/Drop.hs
index 9640d2804..3fe5ab20a 100644
--- a/Command/Drop.hs
+++ b/Command/Drop.hs
@@ -17,10 +17,7 @@ import Logs.Trust
 import Annex.Content
 import Config
 import qualified Option
-import Git.FilePath
-import Logs.PreferredContent
-
-import qualified Data.Set as S
+import Annex.Wanted
 
 def :: [Command]
 def = [withOptions [fromOption] $ command "drop" paramPaths seek
@@ -34,27 +31,15 @@ seek = [withField fromOption Remote.byName $ \from ->
 	withFilesInGit $ whenAnnexed $ start from]
 
 start :: Maybe Remote -> FilePath -> (Key, Backend) -> CommandStart
-start from file (key, _) = shouldDrop $ \numcopies ->
-	case from of
-		Nothing -> startLocal file numcopies key
-		Just remote -> do
-			u <- getUUID
-			if Remote.uuid remote == u
-				then startLocal file numcopies key
-				else startRemote file numcopies key remote
-	where
-		{- In --auto mode, drop if there are enough copies,
-		 - and the repository being dropped from doesn't prefer
-		 - to keep the content. -}
-		shouldDrop a = autoCopiesWith file key (>) $ \numcopies ->
-			ifM (Annex.getState Annex.auto)
-				( do
-					fp <- inRepo $ toTopFilePath file
-					u <- maybe getUUID (return . Remote.uuid) from
-					ifM (isPreferredContent (Just u) (S.singleton u) fp)
-						( a numcopies, stop )
-				, a numcopies
-				)
+start from file (key, _) = autoCopiesWith file key (>) $ \numcopies ->
+	stopUnless (checkAuto $ shouldDrop from file) $
+		case from of
+			Nothing -> startLocal file numcopies key
+			Just remote -> do
+				u <- getUUID
+				if Remote.uuid remote == u
+					then startLocal file numcopies key
+					else startRemote file numcopies key remote
 
 startLocal :: FilePath -> Maybe Int -> Key -> CommandStart
 startLocal file numcopies key = stopUnless (inAnnex key) $ do