diff options
| -rw-r--r-- | CHANGELOG | 9 | ||||
| -rw-r--r-- | Command/Import.hs | 3 | ||||
| -rw-r--r-- | Test.hs | 4 |
3 files changed, 13 insertions, 3 deletions
@@ -34,6 +34,15 @@ git-annex (6.20170102) UNRELEASED; urgency=medium UUID for the new special remote, instead of generating a UUID. This can be useful in some situations, eg when the same data can be accessed via two different special remote backends. + * import: Changed how --deduplicate, --skip-duplicates, and + --clean-duplicates determine if a file is a duplicate. + Before, only content known to be present somewhere was considered + a duplicate. Now, any content that has been annexed before will be + considered a duplicate, even if all annexed copies of the data have + been lost. + Note that --clean-duplicates and --deduplicate still check + numcopies, so won't delete duplicate files unless there's an annexed + copy. -- Joey Hess <id@joeyh.name> Fri, 06 Jan 2017 15:22:06 -0400 diff --git a/Command/Import.hs b/Command/Import.hs index a16349ad2..4b675475d 100644 --- a/Command/Import.hs +++ b/Command/Import.hs @@ -18,6 +18,7 @@ import Types.KeySource import Annex.CheckIgnore import Annex.NumCopies import Annex.FileMatcher +import Logs.Location cmd :: Command cmd = withGlobalOptions (jobsOption : jsonOption : fileMatchingOptions) $ notBareRepo $ @@ -136,7 +137,7 @@ start largematcher mode (srcfile, destfile) = let ks = KeySource srcfile srcfile Nothing v <- genKey ks backend case v of - Just (k, _) -> ifM (not . null <$> keyLocations k) + Just (k, _) -> ifM (isKnownKey k) ( return (maybe Nothing (\a -> Just (a k)) dupa) , return notdupa ) @@ -366,8 +366,8 @@ test_import = intmpclonerepo $ Utility.Tmp.withTmpDir "importtest" $ \importdir git_annex "drop" ["--force", imported1, imported2, imported5] @? "drop failed" annexed_notpresent_imported imported2 (toimportdup, importfdup, importeddup) <- mktoimport importdir "importdup" - git_annex "import" ["--clean-duplicates", toimportdup] - @? "import of missing duplicate with --clean-duplicates failed" + not <$> git_annex "import" ["--clean-duplicates", toimportdup] + @? "import of missing duplicate with --clean-duplicates failed to fail" checkdoesnotexist importeddup checkexists importfdup where |