diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-07-10 20:38:11 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-07-10 20:38:11 -0400 |
| commit | 41ef4b363d155294e77ef8054fb93e2075e89ae2 (patch) | |
| tree | a151ee927d3a2f6d19819d4ca277a9d34c15d4f3 | |
| parent | 8d20a65920cb6ddad186fa11b6fa21a61684de16 (diff) | |
convert FindRef
| -rw-r--r-- | CmdLine/GitAnnex.hs | 4 | ||||
| -rw-r--r-- | Command/Find.hs | 8 | ||||
| -rw-r--r-- | Command/FindRef.hs | 11 |
3 files changed, 11 insertions, 12 deletions
diff --git a/CmdLine/GitAnnex.hs b/CmdLine/GitAnnex.hs index 68a9e27ca..391237ca1 100644 --- a/CmdLine/GitAnnex.hs +++ b/CmdLine/GitAnnex.hs @@ -57,7 +57,7 @@ import qualified Command.Unlock import qualified Command.Lock import qualified Command.PreCommit import qualified Command.Find ---import qualified Command.FindRef +import qualified Command.FindRef import qualified Command.Whereis --import qualified Command.List --import qualified Command.Log @@ -184,7 +184,7 @@ cmds = , Command.DropUnused.cmd , Command.AddUnused.cmd , Command.Find.cmd --- , Command.FindRef.cmd + , Command.FindRef.cmd , Command.Whereis.cmd -- , Command.List.cmd -- , Command.Log.cmd diff --git a/Command/Find.hs b/Command/Find.hs index dd82bd401..ae5595c1d 100644 --- a/Command/Find.hs +++ b/Command/Find.hs @@ -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 () diff --git a/Command/FindRef.hs b/Command/FindRef.hs index cd7583b96..8de7d9e59 100644 --- a/Command/FindRef.hs +++ b/Command/FindRef.hs @@ -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 |