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 /Command/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 'Command/Sync.hs')
| -rw-r--r-- | Command/Sync.hs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Command/Sync.hs b/Command/Sync.hs index acd487df3..5719f5b70 100644 --- a/Command/Sync.hs +++ b/Command/Sync.hs @@ -75,6 +75,7 @@ seek rs = do remotes <- syncRemotes rs let gitremotes = filter Remote.gitSyncableRemote remotes + let dataremotes = filter (not . remoteAnnexIgnore . Remote.gitconfig) remotes -- Syncing involves many actions, any of which can independently -- fail, without preventing the others from running. @@ -85,7 +86,7 @@ seek rs = do , [ mergeAnnex ] ] whenM (Annex.getFlag $ optionName contentOption) $ - seekSyncContent remotes + seekSyncContent dataremotes seekActions $ return $ concat [ [ withbranch pushLocal ] , map (withbranch . pushRemote) gitremotes @@ -112,6 +113,7 @@ syncRemotes rs = ifM (Annex.getState Annex.fast) ( nub <$> pickfast , wanted ) | otherwise = listed listed = catMaybes <$> mapM (Remote.byName . Just) rs available = filter (remoteAnnexSync . Types.Remote.gitconfig) + . filter (not . Remote.isXMPPRemote) <$> Remote.remoteList good r | Remote.gitSyncableRemote r = Remote.Git.repoAvail $ Types.Remote.repo r |