summaryrefslogtreecommitdiff
path: root/Assistant/Monad.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-04-08 15:23:50 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-04-08 15:23:50 -0400
commit6328d368fc73de7c91cb6efa25769297df71897d (patch)
treee240f3d920c7f5bc3dd8f2f54d294497779a53a9 /Assistant/Monad.hs
parent9b09962ee86ec7531d7ca946e62ccf6a48a67399 (diff)
assistant: Now detects immediately when other repositories push changes to
a ssh remote, and pulls. XMPP is no longer needed in this configuration! Requires the remote server have git-annex-shell with notifychanges support. (untested) This commit was sponsored by Geog Wechslberger.
Diffstat (limited to 'Assistant/Monad.hs')
-rw-r--r--Assistant/Monad.hs3
1 files changed, 3 insertions, 0 deletions
diff --git a/Assistant/Monad.hs b/Assistant/Monad.hs
index 7c28c7f6f..350e3d33b 100644
--- a/Assistant/Monad.hs
+++ b/Assistant/Monad.hs
@@ -43,6 +43,7 @@ import Assistant.Types.RepoProblem
import Assistant.Types.Buddies
import Assistant.Types.NetMessager
import Assistant.Types.ThreadName
+import Assistant.Types.RemoteControl
newtype Assistant a = Assistant { mkAssistant :: ReaderT AssistantData IO a }
deriving (
@@ -68,6 +69,7 @@ data AssistantData = AssistantData
, branchChangeHandle :: BranchChangeHandle
, buddyList :: BuddyList
, netMessager :: NetMessager
+ , remoteControl :: RemoteControl
}
newAssistantData :: ThreadState -> DaemonStatusHandle -> IO AssistantData
@@ -86,6 +88,7 @@ newAssistantData st dstatus = AssistantData
<*> newBranchChangeHandle
<*> newBuddyList
<*> newNetMessager
+ <*> newRemoteControl
runAssistant :: AssistantData -> Assistant a -> IO a
runAssistant d a = runReaderT (mkAssistant a) d