From 5112650348f6bf04cebe1fb97ed900b24e4aaac1 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 23 Jan 2014 16:37:08 -0400 Subject: fix transfers of key with no associated file Several places assumed this would not happen, and when the AssociatedFile was Nothing, did nothing. As part of this, preferred content checks pass the Key around. Note that checkMatcher is sometimes now called with Just Key and Just File. It currently constructs a FileMatcher, ignoring the Key. However, if it constructed a FileKeyMatcher, which contained both, then it might be possible to speed up parts of Limit, which currently call the somewhat expensive lookupFileKey to get the Key. I have not made this optimisation yet, because I am not sure if the key is always the same. Will need some significant checking to satisfy myself that's the case.. --- Limit/Wanted.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Limit') diff --git a/Limit/Wanted.hs b/Limit/Wanted.hs index 7e9278202..01b8da6b3 100644 --- a/Limit/Wanted.hs +++ b/Limit/Wanted.hs @@ -13,10 +13,10 @@ import Limit import Types.FileMatcher addWantGet :: Annex () -addWantGet = addLimit $ Right $ const $ checkWant $ wantGet False +addWantGet = addLimit $ Right $ const $ checkWant $ wantGet False Nothing addWantDrop :: Annex () -addWantDrop = addLimit $ Right $ const $ checkWant $ wantDrop False Nothing +addWantDrop = addLimit $ Right $ const $ checkWant $ wantDrop False Nothing Nothing checkWant :: (Maybe FilePath -> Annex Bool) -> MatchInfo -> Annex Bool checkWant a (MatchingFile fi) = a (Just $ matchFile fi) -- cgit v1.2.3