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

avoid using MatchingKey where MatchingFile can be used now

Browse source 
This is actually matching worktree files, and now that a Key can be
provided along with the file when doing that, using MatchingFile
reflects that.
This commit is contained in:
Joey Hess 2020-12-14 17:54:25 -04:00
parent 9de5506f19
commit 5e094d02d6
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CmdLine/Seek.hs
View file

@ -346,7 +346,7 @@ seekFilteredKeys seeker listfs = do
maybe noop (Annex.BranchState.setCache logf) logcontent
checkMatcherWhen mi
(matcherNeedsLocationLog mi && not (matcherNeedsFileName mi))
(MatchingKey k (AssociatedFile (Just f)))
(MatchingFile $ FileInfo (Just f) f (Just k))
(commandAction $ startAction seeker si f k)
precachefinisher mi lreader
Nothing -> return ()
@ -373,7 +373,7 @@ seekFilteredKeys seeker listfs = do
case parseLinkTargetOrPointerLazy =<< content of
Just k -> checkMatcherWhen mi
(matcherNeedsKey mi && not (matcherNeedsFileName mi || matcherNeedsLocationLog mi))
(MatchingKey k (AssociatedFile (Just f)))
(MatchingFile $ FileInfo (Just f) f (Just k))
(checkpresence k (a k))
Nothing -> noop

2
Types/FileMatcher.hs
View file

@ -22,7 +22,7 @@ import qualified Data.Set as S
data MatchInfo
= MatchingFile FileInfo
| MatchingKey Key AssociatedFile
-- ^ This is used when operating on a file that may be in another
-- ^ This is used when matching a file that may be in another
-- branch. The AssociatedFile is the filename, but it should not be
-- accessed from disk when matching.
| MatchingInfo ProvidedInfo