#
#
# patch "src/monotone/MonotoneHandle.cpp"
#  from [64577f6c8702eb62dffdb572226138e6b4fdc399]
#    to [e0ecd3e20d26676662aef0e6db80d995affc123a]
#
============================================================
--- src/monotone/MonotoneHandle.cpp	64577f6c8702eb62dffdb572226138e6b4fdc399
+++ src/monotone/MonotoneHandle.cpp	e0ecd3e20d26676662aef0e6db80d995affc123a
@@ -141,7 +141,7 @@ void MonotoneHandle::validatePrivateKey(
     if (keyFragment.isEmpty())
     {
         throw GuitoneException(
-            QObject::tr("key fragment in URI is empty")
+            QObject::tr("key fragment in URI is empty or missing")
         );
     }
 
@@ -314,16 +314,15 @@ MonotoneHandlePtr MonotoneHandle::create
             type = server_handle;
             validateServerConnection(rx.cap(2));
 
-            if (!rx.cap(1).isEmpty())
-            {
-                QString key;
-                validatePrivateKey(rx.cap(1), key);
+            // FIXME: we might want to make the key part optional once
+            // remote_stdio can do anonymous connects
+            QString key;
+            validatePrivateKey(rx.cap(1), key);
 
-                // FIXME: this might not be so readable, but since most keys
-                // have email syntax, mtn://address@hidden@server.com isn't better
-                // either without escaping
-                cleanedPathOrURI = "mtn://" + key + "@" + rx.cap(2);
-            }
+            // FIXME: this might not be so readable, but since most keys
+            // have email syntax, mtn://address@hidden@server.com isn't better
+            // either without escaping
+            cleanedPathOrURI = "mtn://" + key + "@" + rx.cap(2);
         }
         else
         {