aboutsummaryrefslogtreecommitdiff
path: root/Command/Log.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-01-26 16:25:55 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-01-26 16:25:55 -0400
commit4f050ca9b80d0565e408137f2422e808b82cfd11 (patch)
tree5aca9688e49dee8915a962de4baf4c305ccbfa9e /Command/Log.hs
parent541178b499d084e4041ae4b9d62bf86f5a97c3ff (diff)
reorganize some files and imports
Diffstat (limited to 'Command/Log.hs')
-rw-r--r--Command/Log.hs11
1 files changed, 5 insertions, 6 deletions
diff --git a/Command/Log.hs b/Command/Log.hs
index b7ad664cf..1dd5aa51a 100644
--- a/Command/Log.hs
+++ b/Command/Log.hs
@@ -24,7 +24,6 @@ import qualified Annex.Branch
import qualified Git
import Git.Command
import qualified Remote
-import qualified Option
import qualified Annex
data RefChange = RefChange
@@ -44,14 +43,14 @@ options = passthruOptions ++ [gourceOption]
passthruOptions :: [Option]
passthruOptions = map odate ["since", "after", "until", "before"] ++
- [ Option.field ['n'] "max-count" paramNumber
+ [ fieldOption ['n'] "max-count" paramNumber
"limit number of logs displayed"
]
where
- odate n = Option.field [] n paramDate $ "show log " ++ n ++ " date"
+ odate n = fieldOption [] n paramDate $ "show log " ++ n ++ " date"
gourceOption :: Option
-gourceOption = Option.flag [] "gource" "format output for gource"
+gourceOption = flagOption [] "gource" "format output for gource"
seek :: CommandSeek
seek ps = do
@@ -62,8 +61,8 @@ seek ps = do
withFilesInGit (whenAnnexed $ start m zone os gource) ps
where
getoption o = maybe [] (use o) <$>
- Annex.getField (Option.name o)
- use o v = [Param ("--" ++ Option.name o), Param v]
+ Annex.getField (optionName o)
+ use o v = [Param ("--" ++ optionName o), Param v]
start :: M.Map UUID String -> TimeZone -> [CommandParam] -> Bool ->
FilePath -> (Key, Backend) -> CommandStart