From 74fc9fcbe68ce7802d44499e8b5dc5c5d186ee66 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 2 Aug 2012 14:02:35 -0400 Subject: [PATCH] add alert when committing --- Assistant/Alert.hs | 3 +++ Assistant/Threads/Committer.hs | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Assistant/Alert.hs b/Assistant/Alert.hs index 16ce222ad5..b152c48dca 100644 --- a/Assistant/Alert.hs +++ b/Assistant/Alert.hs @@ -189,6 +189,9 @@ activityAlert header message = baseActivityAlert startupScanAlert :: Alert startupScanAlert = activityAlert Nothing "Performing startup scan" +commitAlert :: Alert +commitAlert = activityAlert Nothing "Committing changes to git" + pushAlert :: [Remote] -> Alert pushAlert rs = activityAlert Nothing $ "Syncing with " ++ unwords (map Remote.name rs) diff --git a/Assistant/Threads/Committer.hs b/Assistant/Threads/Committer.hs index cce8d5e2b6..095c8feac0 100644 --- a/Assistant/Threads/Committer.hs +++ b/Assistant/Threads/Committer.hs @@ -54,7 +54,9 @@ commitThread st changechan commitchan transferqueue dstatus = runEvery (Seconds , show (length readychanges) , "changes" ] - void $ tryIO $ runThreadState st commitStaged + void $ alertWhile dstatus commitAlert $ + tryIO (runThreadState st commitStaged) + >> return True recordCommit commitchan (Commit time) else refill readychanges else refill changes