import: --deduplicate and --cleanduplicates now output the keys corresponding to duplicated files they process.

Command/Import.hs

@@ -15,6 +15,7 @@ import Utility.CopyFile
 import Backend
 import Remote
 import Types.KeySource
+import Types.Key
 
 cmd :: [Command]
 cmd = [withOptions opts $ notBareRepo $ command "import" paramPaths seek
@@ -72,8 +73,8 @@ start mode (srcfile, destfile) =
 		, stop
 		)
   where
-	deletedup = do
+	deletedup k = do
-		showNote "duplicate"
+		showNote $ "duplicate of " ++ key2file k
 		liftIO $ removeFile srcfile
 		next $ return True
 	importfile = do
@@ -95,10 +96,12 @@ start mode (srcfile, destfile) =
 		backend <- chooseBackend destfile
 		let ks = KeySource srcfile srcfile Nothing
 		v <- genKey ks backend
-		isdup <- case v of
+		case v of
-			Just (k, _) -> not . null <$> keyLocations k
+			Just (k, _) -> ifM (not . null <$> keyLocations k)
-			_ -> return False
+				( return (maybe Nothing (\a -> Just (a k)) dupa)
-		return $ if isdup then dupa else notdupa
+				, return notdupa
+				)
+			_ -> return notdupa
 	pickaction = case mode of
 		DeDuplicate -> checkdup (Just deletedup) (Just importfile)
 		CleanDuplicates -> checkdup (Just deletedup) Nothing

debian/changelog

@@ -18,6 +18,8 @@ git-annex (5.20150328) UNRELEASED; urgency=medium
     filename with filenames that the special remote suggests. Also,
     don't allow adding the url if the special remote says it contains
     multiple files.
+  * import: --deduplicate and --cleanduplicates now output the keys
+    corresponding to duplicated files they process.
 
  -- Joey Hess <id@joeyh.name>  Fri, 27 Mar 2015 16:04:43 -0400
 

doc/todo/Output_key_with_import__47__deduplicate.mdwn

@@ -18,3 +18,5 @@ Then you could use
 to find out where it is already.
 
 Not sure if that is the nicest layout.. (or what it might break).
+
+> [[done]] --[[Joey]]