[Monotone-commits-diffs] net.venge.monotone: 3784c72f3fbb028c9d08593574179d311efb507b

[code]

revision:            3784c72f3fbb028c9d08593574179d311efb507b
date:                2010-11-26T23:37:48
author:              address@hidden
branch:              net.venge.monotone
changelog:
* network/connection_info.cc (set_raw_uri): bail out early if uri.host is empty
* tests/netsync_badhost_gives_nice_error/__driver__.lua: expand the existing
  test case accordingly
* NEWS: note the fix

manifest:
format_version "1"

new_manifest [b3172701f0c99e326d30e9aefd751b2bfaba9652]

old_revision [3b415f32eb83376f005aac30faeb1f1fa2314623]

patch "NEWS"
 from [1dbf77ca29d6cd582a59583c9f057d0c881167bf]
   to [37c9b4cc347064d179c82fb88601307bf37a8918]

patch "network/connection_info.cc"
 from [384ae7eb7d9630f38d07c911ef0c39f4e8c2e512]
   to [c6c932cbb017b6527b44426806e6ba76818ab58a]

patch "tests/netsync_badhost_gives_nice_error/__driver__.lua"
 from [5f30e23ba6cf8fcbdf56655180684b0fe762eb52]
   to [840813871ca60bde7d4c8829591932de494219f8]
============================================================
--- NEWS	1dbf77ca29d6cd582a59583c9f057d0c881167bf
+++ NEWS	37c9b4cc347064d179c82fb88601307bf37a8918
@@ -27,8 +27,12 @@ XXX XXX XX XX:XX:XX UTC 2010
 
         - 'automate remote' and 'automate remote_stdio' now use
           a given database given by an alias to read, store and validate
-          a remote server's key fingerprint (fixes monotone issue 95) 
+          a remote server's key fingerprint (fixes monotone issue 95)
 
+        - monotone gives a proper error message now if a netsync URI
+          with the 'mtn' scheme misses the required host part
+          (fixes monotone issue 110)
+
         Internal
 
 
============================================================
--- tests/netsync_badhost_gives_nice_error/__driver__.lua	5f30e23ba6cf8fcbdf56655180684b0fe762eb52
+++ tests/netsync_badhost_gives_nice_error/__driver__.lua	840813871ca60bde7d4c8829591932de494219f8
@@ -1,4 +1,8 @@ mtn_setup()
 
 mtn_setup()
 
-check(mtn("pull", "nosuchhost__blahblah__asdvasoih.com", "some.pattern"), 1, false, false)
+check(mtn("pull", "nosuchhost__blahblah__asdvasoih.com", "some.pattern"), 1, false, true)
+check(qgrep("name resolution failure for nosuchhost__blahblah__asdvasoih.com", "stderr"))
+
+check(mtn("pull", "mtn:localhost?*"), 1, false, true)
+check(qgrep("a non-empty hostname is expected for the 'mtn' uri scheme", "stderr"))
============================================================
--- network/connection_info.cc	384ae7eb7d9630f38d07c911ef0c39f4e8c2e512
+++ network/connection_info.cc	c6c932cbb017b6527b44426806e6ba76818ab58a
@@ -278,6 +278,9 @@ netsync_connection_info::Client::set_raw
 
   if (uri.scheme.empty())
     uri.scheme = "mtn";
+ 
+  E(uri.scheme == "mtn" && !uri.host.empty(), origin::user,
+    F("a non-empty hostname is expected for the 'mtn' uri scheme"));
 
   var_key server_include(var_domain("server-include"),
                          var_name(uri.resource(), origin::user));