Assistant monad, stage 2.5

Converted several threads to run in the monad.

Added a lot of useful combinators for working with the monad.

Now the monad includes the name of the thread.

Some debugging messages are disabled pending converting other threads.

1 files changed, 3 insertions, 3 deletions

diff --git a/Assistant/Sync.hs b/Assistant/Sync.hs
index 8a9cf8985..bd23c7bb4 100644
--- a/Assistant/Sync.hs
+++ b/Assistant/Sync.hs
@@ -93,7 +93,7 @@ pushToRemotes threadname now st mpushnotifier mpushmap remotes = do
 	where
 		go _ Nothing _ _ _ = return True -- no branch, so nothing to do
 		go shouldretry (Just branch) g u rs =  do
-			debug threadname
+			brokendebug threadname
 				[ "pushing to"
 				, show rs
 				]
@@ -117,12 +117,12 @@ pushToRemotes threadname now st mpushnotifier mpushmap remotes = do
 		makemap l = M.fromList $ zip l (repeat now)
 
 		retry branch g u rs = do
-			debug threadname [ "trying manual pull to resolve failed pushes" ]
+			brokendebug threadname [ "trying manual pull to resolve failed pushes" ]
 			void $ manualPull st (Just branch) rs
 			go False (Just branch) g u rs
 
 		fallback branch g u rs = do
-			debug threadname
+			brokendebug threadname
 				[ "fallback pushing to"
 				, show rs
 				]