mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

move some git operations outside the annex monad to avoid blocking other threads

Browse source
This commit is contained in:
Joey Hess 2012-08-22 14:36:58 -04:00
parent 68659f4998
commit 5d577c32a9
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Assistant/Sync.hs
View file

@ -36,12 +36,12 @@ syncRemotes threadname st dstatus scanremotes rs = do
addScanRemotes scanremotes rs
where
sync (Just branch) = do
runThreadState st $ manualPull (Just branch) rs
manualPull st (Just branch) rs
now <- getCurrentTime
pushToRemotes threadname now st Nothing rs
{- No local branch exists yet, but we can try pulling. -}
sync Nothing = do
runThreadState st $ manualPull Nothing rs
manualPull st Nothing rs
return True
{- Updates the local sync branch, then pushes it to all remotes, in
@ -85,14 +85,15 @@ pushToRemotes threadname now st mpushmap remotes = do
retry branch g rs = do
debug threadname [ "trying manual pull to resolve failed pushes" ]
runThreadState st $ manualPull (Just branch) rs
manualPull st (Just branch) rs
go False (Just branch) g rs
{- Manually pull from remotes and merge their branches. -}
manualPull :: (Maybe Git.Ref) -> [Remote] -> Annex ()
manualPull currentbranch remotes = do
manualPull :: ThreadState -> (Maybe Git.Ref) -> [Remote] -> IO ()
manualPull st currentbranch remotes = do
g <- runThreadState st $ fromRepo id
forM_ remotes $ \r ->
inRepo $ Git.Command.runBool "fetch" [Param $ Remote.name r]
Annex.Branch.forceUpdate
Git.Command.runBool "fetch" [Param $ Remote.name r] g
runThreadState st $ Annex.Branch.forceUpdate
forM_ remotes $ \r ->
Command.Sync.mergeRemote r currentbranch
runThreadState st $ Command.Sync.mergeRemote r currentbranch