summaryrefslogtreecommitdiff
path: root/Remote.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-05-15 15:27:49 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-05-15 15:27:49 -0400
commit6aab88fa251a14fbf31c7a8d80296c78db0ed048 (patch)
tree34465a5c706ab825ecd34b9261ecc6f35e4dd555 /Remote.hs
parent1e5beda86a1d0185466547bd1acb61a75ac66992 (diff)
more monadic operator use
Diffstat (limited to 'Remote.hs')
-rw-r--r--Remote.hs12
1 files changed, 5 insertions, 7 deletions
diff --git a/Remote.hs b/Remote.hs
index bbecdb999..211168b15 100644
--- a/Remote.hs
+++ b/Remote.hs
@@ -75,10 +75,10 @@ genList = do
return rs'
else return rs
where
- process m t = do
- l <- enumerate t
- l' <- filterM remoteNotIgnored l
- mapM (gen m t) l'
+ process m t =
+ enumerate t >>=
+ filterM remoteNotIgnored >>=
+ mapM (gen m t)
gen m t r = do
u <- getUUID r
generate t r u (M.lookup u m)
@@ -97,9 +97,7 @@ byName n = do
{- Looks up a remote by name (or by UUID), and returns its UUID. -}
nameToUUID :: String -> Annex UUID
-nameToUUID "." = do -- special case for current repo
- g <- Annex.gitRepo
- getUUID g
+nameToUUID "." = getUUID =<< Annex.gitRepo -- special case for current repo
nameToUUID n = liftM uuid (byName n)
{- Cost ordered lists of remotes that the LocationLog indicate may have a key.