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

unify two similar alerts

Browse source
This commit is contained in:
Joey Hess 2013-03-18 12:17:33 -04:00
parent ed1db85d88
commit 069473872f
2 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Assistant/Alert.hs
View file

@ -239,10 +239,6 @@ commitAlert = activityAlert Nothing
showRemotes :: [Remote] -> TenseChunk showRemotes :: [Remote] -> TenseChunk
showRemotes = UnTensed . T.unwords . map (T.pack . Remote.name) showRemotes = UnTensed . T.unwords . map (T.pack . Remote.name)
pushAlert :: [Remote] -> Alert
pushAlert rs = activityAlert Nothing
[Tensed "Syncing" "Synced", "with", showRemotes rs]
pushRetryAlert :: [Remote] -> Alert pushRetryAlert :: [Remote] -> Alert
pushRetryAlert rs = activityAlert pushRetryAlert rs = activityAlert
(Just $ tenseWords [Tensed "Retrying" "Retried", "sync"]) (Just $ tenseWords [Tensed "Retrying" "Retried", "sync"])

2
Assistant/Sync.hs
View file

@ -104,7 +104,7 @@ pushToRemotes notifypushes remotes = do
let go = pushToRemotes' now notifypushes remotes let go = pushToRemotes' now notifypushes remotes
if null nonxmppremotes if null nonxmppremotes
then go then go
else alertWhile (pushAlert nonxmppremotes) go else alertWhile (syncAlert nonxmppremotes) go
pushToRemotes' :: UTCTime -> Bool -> [Remote] -> Assistant Bool pushToRemotes' :: UTCTime -> Bool -> [Remote] -> Assistant Bool
pushToRemotes' now notifypushes remotes = do pushToRemotes' now notifypushes remotes = do
(g, branch, u) <- liftAnnex $ do (g, branch, u) <- liftAnnex $ do