aboutsummaryrefslogtreecommitdiff
path: root/GitAnnex.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-11-06 00:52:35 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-11-06 00:59:20 -0400
commit244c675db0b59c260ac93d4a96a6be2b40f148e5 (patch)
tree48d950e78b4623f5b72941dc558e2ee386568f28 /GitAnnex.hs
parent97dec88eab69d0bf3d806bb1f4adf54c1b345f77 (diff)
add xmppgit command; roughed out xmpp push protocol and design
Diffstat (limited to 'GitAnnex.hs')
-rw-r--r--GitAnnex.hs11
1 files changed, 9 insertions, 2 deletions
diff --git a/GitAnnex.hs b/GitAnnex.hs
index c35846df7..26a591133 100644
--- a/GitAnnex.hs
+++ b/GitAnnex.hs
@@ -64,14 +64,17 @@ import qualified Command.Import
import qualified Command.Map
import qualified Command.Upgrade
import qualified Command.Version
+import qualified Command.Help
#ifdef WITH_ASSISTANT
import qualified Command.Watch
import qualified Command.Assistant
#ifdef WITH_WEBAPP
import qualified Command.WebApp
#endif
+#ifdef WITH_XMPP
+import qualified Command.XMPPGit
+#endif
#endif
-import qualified Command.Help
cmds :: [Command]
cmds = concat
@@ -117,14 +120,18 @@ cmds = concat
, Command.Map.def
, Command.Upgrade.def
, Command.Version.def
+ , Command.Help.def
#ifdef WITH_ASSISTANT
, Command.Watch.def
, Command.Assistant.def
+ , Command.XMPPGit.def
#ifdef WITH_WEBAPP
, Command.WebApp.def
#endif
+#ifdef WITH_XMPP
+ , Command.XMPPGit.def
+#endif
#endif
- , Command.Help.def
]
options :: [Option]