diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-02-01 10:33:55 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-02-01 10:33:55 -0400 |
| commit | 6f622c6043ad8db9f27a16020c371af68506e8e7 (patch) | |
| tree | ff3ac9ebc96979f98220dc15ca7356c3a0906022 /Assistant/Sync.hs | |
| parent | cf46308597d8633cc7bad9687f7f0baf91e14992 (diff) | |
improve sync with xmpp and annex-ignore
* sync --content: Honor annex-ignore configuration.
* sync: Don't try to sync with xmpp remotes, which are only currently
supported when using the assistant.
Diffstat (limited to 'Assistant/Sync.hs')
| -rw-r--r-- | Assistant/Sync.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Assistant/Sync.hs b/Assistant/Sync.hs index adbe41350..fc95419ab 100644 --- a/Assistant/Sync.hs +++ b/Assistant/Sync.hs @@ -71,7 +71,7 @@ reconnectRemotes notifypushes rs = void $ do mapM_ signal $ filter (`notElem` failedrs) rs' where gitremotes = filter (notspecialremote . Remote.repo) rs - (xmppremotes, nonxmppremotes) = partition isXMPPRemote rs + (xmppremotes, nonxmppremotes) = partition Remote.isXMPPRemote rs notspecialremote r | Git.repoIsUrl r = True | Git.repoIsLocal r = True @@ -133,7 +133,7 @@ pushToRemotes' now notifypushes remotes = do <$> gitRepo <*> inRepo Git.Branch.current <*> getUUID - let (xmppremotes, normalremotes) = partition isXMPPRemote remotes + let (xmppremotes, normalremotes) = partition Remote.isXMPPRemote remotes ret <- go True branch g u normalremotes unless (null xmppremotes) $ do shas <- liftAnnex $ map fst <$> @@ -206,7 +206,7 @@ syncAction rs a return failed where visibleremotes = filter (not . Remote.readonly) $ - filter (not . isXMPPRemote) rs + filter (not . Remote.isXMPPRemote) rs {- Manually pull from remotes and merge their branches. Returns any - remotes that it failed to pull from, and a Bool indicating @@ -220,7 +220,7 @@ syncAction rs a manualPull :: Maybe Git.Ref -> [Remote] -> Assistant ([Remote], Bool) manualPull currentbranch remotes = do g <- liftAnnex gitRepo - let (xmppremotes, normalremotes) = partition isXMPPRemote remotes + let (xmppremotes, normalremotes) = partition Remote.isXMPPRemote remotes failed <- liftIO $ forM normalremotes $ \r -> ifM (Git.Command.runBool [Param "fetch", Param $ Remote.name r] g) ( return Nothing |