summaryrefslogtreecommitdiff
path: root/Command/Sync.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-02-11 13:11:49 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-02-11 13:11:49 -0400
commitcbb6c57513753ca9e787bfeff1145c5c9d62aedd (patch)
tree00f55f029aac9a24b99f9d10a11c765e251262b3 /Command/Sync.hs
parentab42e74ee2449ac1eeb21cd4f4db143abc5fa156 (diff)
hlint to give autobuilder something to do
Diffstat (limited to 'Command/Sync.hs')
-rw-r--r--Command/Sync.hs12
1 files changed, 6 insertions, 6 deletions
diff --git a/Command/Sync.hs b/Command/Sync.hs
index 331f5d03f..90b9a6c79 100644
--- a/Command/Sync.hs
+++ b/Command/Sync.hs
@@ -86,7 +86,7 @@ seek rs = do
, [ mergeAnnex ]
]
whenM (Annex.getFlag $ optionName contentOption) $
- whenM (seekSyncContent dataremotes) $ do
+ whenM (seekSyncContent dataremotes) $
-- Transferring content can take a while,
-- and other changes can be pushed to the git-annex
-- branch on the remotes in the meantime, so pull
@@ -224,7 +224,7 @@ mergeRemote remote b = case b of
Just _ -> and <$> (mapM merge =<< tomerge (branchlist b))
where
merge = mergeFrom . remoteBranch remote
- tomerge branches = filterM (changed remote) branches
+ tomerge = filterM (changed remote)
branchlist Nothing = []
branchlist (Just branch) = [branch, syncBranch branch]
@@ -452,7 +452,7 @@ resolveMerge' u
Just target -> do
unlessM (coreSymlinks <$> Annex.getGitConfig) $
addAnnexLink target f
- maybe noop (flip toDirect f)
+ maybe noop (`toDirect` f)
(fileKey (takeFileName target))
{- git-merge moves conflicting files away to files
@@ -535,7 +535,7 @@ newer remote b = do
-}
seekSyncContent :: [Remote] -> Annex Bool
seekSyncContent rs = do
- mvar <- liftIO $ newEmptyMVar
+ mvar <- liftIO newEmptyMVar
mapM_ (go mvar) =<< seekHelper LsFiles.inRepo []
liftIO $ not <$> isEmptyMVar mvar
where
@@ -552,7 +552,7 @@ syncFile rs f (k, _) = do
putrs <- catMaybes . snd . unzip <$> (sequence =<< handleput lack)
u <- getUUID
- let locs' = concat [if got then [u] else [], putrs, locs]
+ let locs' = concat [[u | got], putrs, locs]
-- Using callCommandAction rather than commandAction for drops,
-- because a failure to drop does not mean the sync failed.
@@ -576,7 +576,7 @@ syncFile rs f (k, _) = do
| Remote.readonly r || remoteAnnexReadOnly (Types.Remote.gitconfig r) = return False
| otherwise = wantSend True (Just k) (Just f) (Remote.uuid r)
handleput lack = ifM (inAnnex k)
- ( map put <$> (filterM wantput lack)
+ ( map put <$> filterM wantput lack
, return []
)
put dest = do