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/DaemonStatus.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/DaemonStatus.hs')
| -rw-r--r-- | Assistant/DaemonStatus.hs | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/Assistant/DaemonStatus.hs b/Assistant/DaemonStatus.hs index e38463ff6..eb842b784 100644 --- a/Assistant/DaemonStatus.hs +++ b/Assistant/DaemonStatus.hs @@ -55,7 +55,7 @@ calcSyncRemotes = do let good r = Remote.uuid r `elem` alive let syncable = filter good rs let syncdata = filter (not . remoteAnnexIgnore . Remote.gitconfig) $ - filter (not . isXMPPRemote) syncable + filter (not . Remote.isXMPPRemote) syncable return $ \dstatus -> dstatus { syncRemotes = syncable @@ -257,11 +257,5 @@ alertDuring alert a = do i <- addAlert $ alert { alertClass = Activity } removeAlert i `after` a -{- Remotes using the XMPP transport have urls like xmpp::user@host -} -isXMPPRemote :: Remote -> Bool -isXMPPRemote remote = Git.repoIsUrl r && "xmpp::" `isPrefixOf` Git.repoLocation r - where - r = Remote.repo remote - getXMPPClientID :: Remote -> ClientID getXMPPClientID r = T.pack $ drop (length "xmpp::") (Git.repoLocation (Remote.repo r)) |