diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-04-08 15:36:09 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-04-08 15:43:43 -0400 |
| commit | 42e27ceffa8ca585be4a684c43ec187121418b70 (patch) | |
| tree | 249bca21cb6eab3c0997d88a33f325d3acb00fb5 /Assistant | |
| parent | 53de52f410dceb5c80bcfd889209b9199f052348 (diff) | |
syncNewRemote is not only used for new remotes; rename to syncRemote
Diffstat (limited to 'Assistant')
| -rw-r--r-- | Assistant/MakeRemote.hs | 2 | ||||
| -rw-r--r-- | Assistant/Sync.hs | 6 | ||||
| -rw-r--r-- | Assistant/XMPP/Git.hs | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/Assistant/MakeRemote.hs b/Assistant/MakeRemote.hs index 866585319..33ca0b2c0 100644 --- a/Assistant/MakeRemote.hs +++ b/Assistant/MakeRemote.hs @@ -32,7 +32,7 @@ makeSshRemote forcersync sshdata mcost = do r <- liftAnnex $ addRemote $ maker (sshRepoName sshdata) sshurl liftAnnex $ maybe noop (setRemoteCost r) mcost - syncNewRemote r + syncRemote r return r where rsync = forcersync || rsyncOnly sshdata diff --git a/Assistant/Sync.hs b/Assistant/Sync.hs index 50e8e7321..78fdbab1a 100644 --- a/Assistant/Sync.hs +++ b/Assistant/Sync.hs @@ -204,9 +204,9 @@ manualPull currentbranch remotes = do sendNetMessage $ Pushing (getXMPPClientID r) PushRequest return (catMaybes failed, haddiverged) -{- Start syncing a newly added remote, using a background thread. -} -syncNewRemote :: Remote -> Assistant () -syncNewRemote remote = do +{- Start syncing a remote, using a background thread. -} +syncRemote :: Remote -> Assistant () +syncRemote remote = do updateSyncRemotes thread <- asIO $ do reconnectRemotes False [remote] diff --git a/Assistant/XMPP/Git.hs b/Assistant/XMPP/Git.hs index f90af4080..4fd878a9e 100644 --- a/Assistant/XMPP/Git.hs +++ b/Assistant/XMPP/Git.hs @@ -60,7 +60,7 @@ makeXMPPGitRemote buddyname jid u = do liftAnnex $ void remoteListRefresh remote' <- liftAnnex $ fromMaybe (error "failed to add remote") <$> Remote.byName (Just buddyname) - syncNewRemote remote' + syncRemote remote' return True {- Pushes over XMPP, communicating with a specific client. |