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

improve syncing support for special remotes

Browse source 
Avoid trying to git push/pull to special remotes, but still do transfer
scans of them, after git pull from any other remotes, so we know about
any values that have been placed on them.
This commit is contained in:
Joey Hess 2012-09-04 15:54:30 -04:00
parent 4abe03635e
commit 8a796cfa64
2 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Assistant/Sync.hs
View file

@ -19,6 +19,7 @@ import qualified Git
import qualified Git.Branch import qualified Git.Branch
import qualified Git.Command import qualified Git.Command
import qualified Remote import qualified Remote
import qualified Types.Remote as Remote
import qualified Annex.Branch import qualified Annex.Branch
import Data.Time.Clock import Data.Time.Clock
@ -36,18 +37,22 @@ reconnectRemotes :: ThreadName -> ThreadState -> DaemonStatusHandle -> ScanRemot
reconnectRemotes _ _ _ _ [] = noop reconnectRemotes _ _ _ _ [] = noop
reconnectRemotes threadname st dstatus scanremotes rs = void $ reconnectRemotes threadname st dstatus scanremotes rs = void $
alertWhile dstatus (syncAlert rs) $ do alertWhile dstatus (syncAlert rs) $ do
sync =<< runThreadState st (inRepo Git.Branch.current) (ok, diverged) <- sync
=<< runThreadState st (inRepo Git.Branch.current)
addScanRemotes scanremotes diverged rs
return ok
where where
(gitremotes, specialremotes) =
partition (Git.repoIsUrl . Remote.repo) rs
sync (Just branch) = do sync (Just branch) = do
diverged <- manualPull st (Just branch) rs diverged <- manualPull st (Just branch) gitremotes
addScanRemotes scanremotes diverged rs now <- getCurrentTime
now <- getCurrentTime ok <- pushToRemotes threadname now st Nothing gitremotes
pushToRemotes threadname now st Nothing rs return (ok, diverged)
{- No local branch exists yet, but we can try pulling. -} {- No local branch exists yet, but we can try pulling. -}
sync Nothing = do sync Nothing = do
diverged <- manualPull st Nothing rs diverged <- manualPull st Nothing gitremotes
addScanRemotes scanremotes diverged rs return (True, diverged)
return True
{- Updates the local sync branch, then pushes it to all remotes, in {- Updates the local sync branch, then pushes it to all remotes, in
- parallel. - parallel.

7
Assistant/Threads/NetWatcher.hs
View file

@ -121,10 +121,9 @@ listenWicdConnections client callback =
#endif #endif
handleConnection :: ThreadState -> DaemonStatusHandle -> ScanRemoteMap -> IO () handleConnection :: ThreadState -> DaemonStatusHandle -> ScanRemoteMap -> IO ()
handleConnection st dstatus scanremotes = do handleConnection st dstatus scanremotes =
reconnectRemotes thisThread st dstatus scanremotes =<< reconnectRemotes thisThread st dstatus scanremotes
filter (Git.repoIsUrl . Remote.repo) =<< networkRemotes st
<$> networkRemotes st
{- Finds network remotes. -} {- Finds network remotes. -}
networkRemotes :: ThreadState -> IO [Remote] networkRemotes :: ThreadState -> IO [Remote]