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

convert FindRef

Browse source
This commit is contained in:
Joey Hess 2015-07-10 20:38:11 -04:00
parent 9659052e3f
commit 02f6d9b33a
3 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Command/Find.hs
View file

@ -48,14 +48,14 @@ parseFormatOption =
)
seek :: FindOptions -> CommandSeek
seek o = withFilesInGit (whenAnnexed $ start (formatOption o)) (findThese o)
seek o = withFilesInGit (whenAnnexed $ start o) (findThese o)
start :: Maybe Utility.Format.Format -> FilePath -> Key -> CommandStart
start format file key = do
start :: FindOptions -> FilePath -> Key -> CommandStart
start o file key = do
-- only files inAnnex are shown, unless the user has requested
-- others via a limit
whenM (limited <||> inAnnex key) $
showFormatted format file $ ("file", file) : keyVars key
showFormatted (formatOption o) file $ ("file", file) : keyVars key
stop
showFormatted :: Maybe Utility.Format.Format -> String -> [(String, String)] -> Annex ()

11
Command/FindRef.hs
View file

@ -7,16 +7,15 @@
module Command.FindRef where
import Common.Annex
import Command
import qualified Command.Find as Find
cmd :: Command
cmd = withOptions nonWorkTreeMatchingOptions $ Find.mkCommand $
cmd = withGlobalOptions nonWorkTreeMatchingOptions $ Find.mkCommand $
command "findref" SectionPlumbing
"lists files in a git ref"
paramRef (withParams seek)
paramRef (seek <$$> Find.optParser)
seek :: CmdParams -> CommandSeek
seek refs = do
format <- Find.getFormat
Find.start format `withFilesInRefs` refs
seek :: Find.FindOptions -> CommandSeek
seek o = Find.start o `withFilesInRefs` Find.findThese o