webapp: full wormhole pairing UI (untested)

This commit was sponsored by Riku Voipio.

6 files changed, 30 insertions, 6 deletions

diff --git a/Assistant/Threads/WebApp.hs b/Assistant/Threads/WebApp.hs
index 928d0cdd3..dfb631bc6 100644
--- a/Assistant/Threads/WebApp.hs
+++ b/Assistant/Threads/WebApp.hs
@@ -36,6 +36,7 @@ import Assistant.WebApp.Documentation
 import Assistant.WebApp.Control
 import Assistant.WebApp.OtherRepos
 import Assistant.WebApp.Repair
+import Assistant.WebApp.Pairing
 import Assistant.Types.ThreadedMonad
 import Utility.WebApp
 import Utility.AuthToken
@@ -82,6 +83,7 @@ webAppThread assistantdata urlrenderer noannex cannotrun postfirstrun listenhost
 		<*> pure cannotrun
 		<*> pure noannex
 		<*> pure listenhost'
+		<*> newWormholePairingState
 	setUrlRenderer urlrenderer $ yesodRender webapp (pack "")
 	app <- toWaiAppPlain webapp
 	app' <- ifM debugEnabled
diff --git a/CHANGELOG b/CHANGELOG
index 7a0ca2eb2..985b9965c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,13 @@
-git-annex (6.20161211) UNRELEASED; urgency=medium
+git-annex (6.20170101) UNRELEASED; urgency=medium
 
-  * p2p --pair makes it easy to pair repositories over P2P, using
+  * XMPP support has been removed from the assistant in this release.
+    If your repositories used XMPP to keep in sync, that will no longer
+    work, and you should enable some other remote to keep them in sync.
+    A ssh server is one way, or use the new Tor pairing feature.
+  * p2p --pair makes it easy to pair repositories, using
     Magic Wormhole codes to find the other repository.
+  * webapp: The "Share with a friend" and "Share with your other devices"
+    pages have been changed to pair repositories using Tor and Magic Wormhole.
   * metadata --batch: Fix bug when conflicting metadata changes were
     made in the same batch run.
   * Pass annex.web-options to wget and curl after other options, so that
diff --git a/Command/P2P.hs b/Command/P2P.hs
index 48e647273..b70e3e2b7 100644
--- a/Command/P2P.hs
+++ b/Command/P2P.hs
@@ -168,7 +168,7 @@ performPairing remotename addrs = do
 					putStrLn "Exchanging pairing data..."
 					return code
 				| otherwise -> do
-					putStrLn "Oops -- You entered this repository's pairing code. We need the pairing code of the *other* repository."
+					putStrLn "Oops -- You entered this repository's pairing code. Enter the pairing code of the *other* repository."
 					getcode ourcode
 			Nothing -> do
 				putStrLn "That does not look like a valiad pairing code. Try again..."
diff --git a/NEWS b/NEWS
index 1266bae20..0e3db783f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,13 @@
+git-annex (6.20170101) unstable; urgency=low
+
+  XMPP support has been removed from the assistant in this release.
+
+  If your repositories used XMPP to keep in sync, that will no longer
+  work, and you should enable some other remote to keep them in sync.
+  A ssh server is one way, or use the new Tor pairing feature.
+
+ -- Joey Hess <id@joeyh.name>  Tue, 27 Dec 2016 16:37:46 -0400
+
 git-annex (4.20131002) unstable; urgency=low
 
    The layout of gcrypt repositories has changed, and
diff --git a/doc/assistant/release_notes.mdwn b/doc/assistant/release_notes.mdwn
index dc3b7b7b7..6c7c432de 100644
--- a/doc/assistant/release_notes.mdwn
+++ b/doc/assistant/release_notes.mdwn
@@ -1,6 +1,10 @@
 ## version 6.20170101
 
-This release removes XMPP support. Instead, the new Tor support can be used.
+XMPP support has been removed from the assistant in this release.
+
+If your repositories used XMPP to keep in sync, that will no longer
+work, and you should enable some other remote to keep them in sync.
+A ssh server is one way, or use the new Tor pairing feature.
 
 ## version 5.20140421
 
diff --git a/git-annex.cabal b/git-annex.cabal
index f2ba88979..b58f40e32 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -197,7 +197,8 @@ Extra-Source-Files:
   templates/configurators/enablewebdav.hamlet
   templates/configurators/pairing/local/inprogress.hamlet
   templates/configurators/pairing/local/prompt.hamlet
-  templates/configurators/pairing/tor/prompt.hamlet
+  templates/configurators/pairing/wormhole/prompt.hamlet
+  templates/configurators/pairing/wormhole/start.hamlet
   templates/configurators/pairing/disabled.hamlet
   templates/configurators/addglacier.hamlet
   templates/configurators/fsck.cassius
@@ -220,9 +221,9 @@ Extra-Source-Files:
   templates/configurators/addrepository/archive.hamlet
   templates/configurators/addrepository/cloud.hamlet
   templates/configurators/addrepository/connection.hamlet
-  templates/configurators/addrepository/torconnection.hamlet
   templates/configurators/addrepository/ssh.hamlet
   templates/configurators/addrepository/misc.hamlet
+  templates/configurators/addrepository/wormholepairing.hamlet
   templates/configurators/rsync.net/add.hamlet
   templates/configurators/rsync.net/encrypt.hamlet
   templates/configurators/gitlab.com/add.hamlet
@@ -642,6 +643,7 @@ Executable git-annex
     Assistant.WebApp.Notifications
     Assistant.WebApp.OtherRepos
     Assistant.WebApp.Page
+    Assistant.WebApp.Pairing
     Assistant.WebApp.Repair
     Assistant.WebApp.RepoId
     Assistant.WebApp.RepoList