summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Annex/Content.hs2
-rw-r--r--Annex/Queue.hs4
-rw-r--r--Command/Commit.hs2
-rw-r--r--Command/Unused.hs4
-rw-r--r--Remote/Rsync.hs2
-rw-r--r--Seek.hs2
-rw-r--r--Upgrade/V2.hs2
7 files changed, 9 insertions, 9 deletions
diff --git a/Annex/Content.hs b/Annex/Content.hs
index 3e3e95868..0bce5633f 100644
--- a/Annex/Content.hs
+++ b/Annex/Content.hs
@@ -242,7 +242,7 @@ cleanObjectLoc key = do
removeparents file n = do
let dir = parentDir file
maybe noop (const $ removeparents dir (n-1))
- =<< catchMaybeIO (removeDirectory dir)
+ <=< catchMaybeIO $ removeDirectory dir
{- Removes a key's file from .git/annex/objects/ -}
removeAnnex :: Key -> Annex ()
diff --git a/Annex/Queue.hs b/Annex/Queue.hs
index c019aed6c..97a759d10 100644
--- a/Annex/Queue.hs
+++ b/Annex/Queue.hs
@@ -23,13 +23,13 @@ import Config
addCommand :: String -> [CommandParam] -> [FilePath] -> Annex ()
addCommand command params files = do
q <- get
- store =<< inRepo (Git.Queue.addCommand command params files q)
+ store <=< inRepo $ Git.Queue.addCommand command params files q
{- Adds an update-index stream to the queue. -}
addUpdateIndex :: Git.UpdateIndex.Streamer -> Annex ()
addUpdateIndex streamer = do
q <- get
- store =<< inRepo (Git.Queue.addUpdateIndex streamer q)
+ store <=< inRepo $ Git.Queue.addUpdateIndex streamer q
{- Runs the queue if it is full. Should be called periodically. -}
flushWhenFull :: Annex ()
diff --git a/Command/Commit.hs b/Command/Commit.hs
index f53ab7e09..d3ce3d7bb 100644
--- a/Command/Commit.hs
+++ b/Command/Commit.hs
@@ -22,7 +22,7 @@ seek = [withNothing start]
start :: CommandStart
start = next $ next $ do
Annex.Branch.commit "update"
- _ <- runhook =<< inRepo (Git.hookPath "annex-content")
+ _ <- runhook <=< inRepo $ Git.hookPath "annex-content"
return True
where
runhook (Just hook) = liftIO $ boolSystem hook []
diff --git a/Command/Unused.hs b/Command/Unused.hs
index 1224d0545..03a709534 100644
--- a/Command/Unused.hs
+++ b/Command/Unused.hs
@@ -84,7 +84,7 @@ checkRemoteUnused name = go =<< fromJust <$> Remote.byName (Just name)
_ <- check "" (remoteUnusedMsg r) (remoteunused r) 0
next $ return True
remoteunused r =
- excludeReferenced =<< loggedKeysFor (Remote.uuid r)
+ excludeReferenced <=< loggedKeysFor $ Remote.uuid r
check :: FilePath -> ([(Int, Key)] -> String) -> Annex [Key] -> Int -> Annex Int
check file msg a c = do
@@ -260,7 +260,7 @@ withKeysReferencedInGit a = do
withKeysReferencedInGitRef :: (Key -> Annex ()) -> Git.Ref -> Annex ()
withKeysReferencedInGitRef a ref = do
showAction $ "checking " ++ Git.Ref.describe ref
- go =<< inRepo (LsTree.lsTree ref)
+ go <=< inRepo $ LsTree.lsTree ref
where
go [] = noop
go (l:ls)
diff --git a/Remote/Rsync.hs b/Remote/Rsync.hs
index df4e0a44f..3c449b5de 100644
--- a/Remote/Rsync.hs
+++ b/Remote/Rsync.hs
@@ -100,7 +100,7 @@ rsyncUrls o k = map use annexHashes
f = keyFile k
store :: RsyncOpts -> Key -> Annex Bool
-store o k = rsyncSend o k =<< inRepo (gitAnnexLocation k)
+store o k = rsyncSend o k <=< inRepo $ gitAnnexLocation k
storeEncrypted :: RsyncOpts -> (Cipher, Key) -> Key -> Annex Bool
storeEncrypted o (cipher, enck) k = withTmp enck $ \tmp -> do
diff --git a/Seek.hs b/Seek.hs
index eed4a8155..2cf0d8d46 100644
--- a/Seek.hs
+++ b/Seek.hs
@@ -95,7 +95,7 @@ withValue v a params = do
-}
withField :: Option -> (Maybe String -> Annex a) -> (a -> CommandSeek) -> CommandSeek
withField option converter = withValue $
- converter =<< Annex.getField (Option.name option)
+ converter <=< Annex.getField $ Option.name option
withFlag :: Option -> (Bool -> CommandSeek) -> CommandSeek
withFlag option = withValue $ Annex.getFlag (Option.name option)
diff --git a/Upgrade/V2.hs b/Upgrade/V2.hs
index 202ba5b16..c001bc5a9 100644
--- a/Upgrade/V2.hs
+++ b/Upgrade/V2.hs
@@ -84,7 +84,7 @@ inject source dest = do
logFiles :: FilePath -> Annex [FilePath]
logFiles dir = return . filter (".log" `isSuffixOf`)
- =<< liftIO (getDirectoryContents dir)
+ <=< liftIO $ getDirectoryContents dir
push :: Annex ()
push = do