# HG changeset patch
# User Chris Cannam
# Date 1567163656 -3600
# Node ID 684a917e2d96bbea5fbec4df26fc43d38bc9cf8c
# Parent  46cd8639d48b82953c6c2710d49335aa3a4e2f5a
Bitbucket -> Sourcehut, and subrepo update

diff -r 46cd8639d48b -r 684a917e2d96 main/NetworkPermissionTester.cpp
--- a/main/NetworkPermissionTester.cpp	Thu Aug 29 14:51:33 2019 +0100
+++ b/main/NetworkPermissionTester.cpp	Fri Aug 30 12:14:16 2019 +0100
@@ -53,16 +53,16 @@
 	label->setText
 	    (QCoreApplication::translate
 	     ("NetworkPermissionTester",
-	      "<h2>Tony: a tool for melody annotation</h2>"
+	      "<h2>Welcome to Tony!</h2>"
 	      "<p><img src=\":icons/qm-logo-smaller.png\" style=\"float:right\">Tony is a program for computer-assisted pitch and note annotation of unaccompanied melody.</p>"
-	      "<p>Developed in the Centre for Digital Music at Queen Mary, University of London, Tony is provided free as open source software under the GNU General Public License.</p>"
+	      "<p>Developed in the Centre for Digital Music at Queen Mary, University of London, Tony is open source software under the GNU General Public License.</p>"
               "<p><hr></p>"
 	      "<p><b>Before we go on...</b></p>"
 	      "<p>Tony needs to make occasional network requests to our servers.</p>"
 	      "<p>This is to:</p>"
-	      "<ul><li> tell you when updates are available.</li></ul>"
-	      "<p>No personal information will be sent, no tracking is carried out, and all requests happen in the background without interrupting your work.</p>"
-	      "<p>We recommend that you allow this. But if you do not wish to do so, please un-check the box below.<br></p>"));
+	      "<ul><li> Tell you when updates are available.</li></ul>"
+	      "<p><b>No personal information will be sent, no tracking is carried out, and no individual information will be shared with anyone else.</b> We will however make aggregate counts of distinct requests for usage reporting.</p>"
+             "<p>We recommend that you allow this, because it makes Tony more useful to you and supports the public funding of this work. But if you do not wish to allow it, please un-check the box below.<br></p>"));
 	layout->addWidget(label, 0, 0);
 
 	QCheckBox *cb = new QCheckBox(QCoreApplication::translate("NetworkPermissionTester", "Allow this"));
diff -r 46cd8639d48b -r 684a917e2d96 repoint-lock.json
--- a/repoint-lock.json	Thu Aug 29 14:51:33 2019 +0100
+++ b/repoint-lock.json	Fri Aug 30 12:14:16 2019 +0100
@@ -22,13 +22,13 @@
       "pin": "b82360a98f49"
     },
     "bqvec": {
-      "pin": "c2d355c29372"
+      "pin": "cd235ecbeb31"
     },
     "bqfft": {
-      "pin": "ff1d1bd48876"
+      "pin": "e1c392f85e97"
     },
     "bqresample": {
-      "pin": "f5dee7d40378"
+      "pin": "c2fb51b31fe4"
     },
     "bqaudioio": {
       "pin": "8c4162878ae6"
diff -r 46cd8639d48b -r 684a917e2d96 repoint-project.json
--- a/repoint-project.json	Thu Aug 29 14:51:33 2019 +0100
+++ b/repoint-project.json	Fri Aug 30 12:14:16 2019 +0100
@@ -38,37 +38,37 @@
         },
         "dataquay": {
             "vcs": "hg",
-            "service": "bitbucket",
+            "service": "sourcehut",
             "owner": "breakfastquay"
         },
         "bqvec": {
             "vcs": "hg",
-            "service": "bitbucket",
+            "service": "sourcehut",
             "owner": "breakfastquay"
         },
         "bqfft": {
             "vcs": "hg",
-            "service": "bitbucket",
+            "service": "sourcehut",
             "owner": "breakfastquay"
         },
         "bqresample": {
             "vcs": "hg",
-            "service": "bitbucket",
+            "service": "sourcehut",
             "owner": "breakfastquay"
         },
         "bqaudioio": {
             "vcs": "hg",
-            "service": "bitbucket",
+            "service": "sourcehut",
             "owner": "breakfastquay"
         },
         "bqaudiostream": {
             "vcs": "hg",
-            "service": "bitbucket",
+            "service": "sourcehut",
             "owner": "breakfastquay"
         },
         "bqthingfactory": {
             "vcs": "hg",
-            "service": "bitbucket",
+            "service": "sourcehut",
             "owner": "breakfastquay"
         },
         "sv-dependency-builds": {
diff -r 46cd8639d48b -r 684a917e2d96 repoint.sml
--- a/repoint.sml	Thu Aug 29 14:51:33 2019 +0100
+++ b/repoint.sml	Fri Aug 30 12:14:16 2019 +0100
@@ -38,7 +38,7 @@
     authorization.
 *)
 
-val repoint_version = "1.1"
+val repoint_version = "1.2"
 
 
 datatype vcs =
@@ -279,6 +279,18 @@
 
     fun trim str =
         hd (String.fields (fn x => x = #"\n" orelse x = #"\r") str)
+
+    fun make_canonical path =
+        (* SML/NJ doesn't properly handle "/" when splitting paths -
+           it should be a path separator even on Windows, but SML/NJ
+           treats it as a normal filename character there. So we must
+           convert these explicitly *)
+        OS.Path.mkCanonical
+            (if OS.Path.concat ("a", "b") = "a\\b"
+             then String.translate (fn #"/" => "\\" |
+                                    c => Char.toString c)
+                                   path
+             else path)
             
     fun file_url path =
         let val forward_path = 
@@ -317,7 +329,7 @@
                 then arg
                 else "\"" ^ arg ^ "\""
             fun check arg =
-                let val valid = explode " /#:;?,._-{}@=+"
+                let val valid = explode " /#:;?,._-{}@=+%"
                 in
                     app (fn c =>
                             if isAlphaNum c orelse
@@ -427,7 +439,7 @@
                                       ERROR ("Directory creation failed: " ^ e))
 
     fun mkpath path =
-        mkpath' (OS.Path.mkCanonical path)
+        mkpath' (make_canonical path)
 
     fun dir_contents dir =
         let open OS
@@ -463,7 +475,7 @@
         end
 
     fun rmpath path =
-        rmpath' (OS.Path.mkCanonical path)
+        rmpath' (make_canonical path)
 
     fun nonempty_dir_exists path =
         let open OS.FileSys
@@ -1035,6 +1047,13 @@
                 anon = SOME "https://github.com/{owner}/{repository}",
                 auth = SOME "ssh://{vcs}@github.com/{owner}/{repository}"
             }
+          },
+          { service = "sourcehut",
+            supports = [HG, GIT],
+            remote_spec = {
+                anon = SOME "https://{vcs}.sr.ht/%7E{owner}/{repository}",
+                auth = SOME "ssh://{vcs}@{vcs}.sr.ht/%7E{owner}/{repository}"
+            }
           }
         ]