diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-11-08 15:34:10 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-11-08 16:27:20 -0400 |
| commit | bf460a0a98d7e4c7f4eac525fcf300629db582b6 (patch) | |
| tree | bff7cd09529c40fa8cb76fd92428cc41e24ad808 /Command/DropUnused.hs | |
| parent | 2ff8915365099501382183af9855e739fc234861 (diff) | |
reorder repo parameters last
Many functions took the repo as their first parameter. Changing it
consistently to be the last parameter allows doing some useful things with
currying, that reduce boilerplate.
In particular, g <- gitRepo is almost never needed now, instead
use inRepo to run an IO action in the repo, and fromRepo to get
a value from the repo.
This also provides more opportunities to use monadic and applicative
combinators.
Diffstat (limited to 'Command/DropUnused.hs')
| -rw-r--r-- | Command/DropUnused.hs | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Command/DropUnused.hs b/Command/DropUnused.hs index 70dcc4cc7..55c21f83b 100644 --- a/Command/DropUnused.hs +++ b/Command/DropUnused.hs @@ -58,17 +58,15 @@ perform key = maybe droplocal dropremote =<< Annex.getState Annex.fromremote next $ Command.Drop.cleanupRemote key r droplocal = Command.Drop.performLocal key (Just 0) -- force drop -performOther :: (Git.Repo -> Key -> FilePath) -> Key -> CommandPerform +performOther :: (Key -> Git.Repo -> FilePath) -> Key -> CommandPerform performOther filespec key = do - g <- gitRepo - let f = filespec g key + f <- fromRepo $ filespec key liftIO $ whenM (doesFileExist f) $ removeFile f next $ return True readUnusedLog :: FilePath -> Annex UnusedMap readUnusedLog prefix = do - g <- gitRepo - let f = gitAnnexUnusedLog prefix g + f <- fromRepo $ gitAnnexUnusedLog prefix e <- liftIO $ doesFileExist f if e then M.fromList . map parse . lines <$> liftIO (readFile f) |