mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix transfers of key with no associated file

Browse source 
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..
This commit is contained in:
Joey Hess 2014-01-23 16:37:08 -04:00
parent 90bc6e3137
commit 3518c586cf
13 changed files with 79 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Command/Sync.hs
View file

@ -519,7 +519,7 @@ syncFile rs f (k, _) = do
wantget have = allM id
[ pure (not $ null have)
, not <$> inAnnex k
, wantGet True (Just f)
, wantGet True (Just k) (Just f)
]
handleget have = ifM (wantget have)
( return [ get have ]
@ -531,7 +531,7 @@ syncFile rs f (k, _) = do
wantput r
| Remote.readonly r || remoteAnnexReadOnly (Types.Remote.gitconfig r) = return False
| otherwise = wantSend True (Just f) (Remote.uuid r)
| otherwise = wantSend True (Just k) (Just f) (Remote.uuid r)
handleput lack = ifM (inAnnex k)
( map put <$> (filterM wantput lack)
, return []