aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Assistant/Alert.hs3
-rw-r--r--Assistant/Threads/Committer.hs4
2 files changed, 6 insertions, 1 deletions
diff --git a/Assistant/Alert.hs b/Assistant/Alert.hs
index 16ce222ad..b152c48dc 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 cce8d5e2b..095c8feac 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