merge with stable

contrib/packaging/packagelib.sh

@@ -28,9 +28,9 b' gethgversion() {'
         distance=''
         node=''
     fi
-    if echo $hgversion | grep -- '-' > /dev/null 2>&1; then
-        version=`echo $hgversion | cut -d- -f1`
-        type=`echo $hgversion | cut -d- -f2`
+    if echo $hgversion | grep -E -- '[0-9]\.[0-9](\.[0-9])?rc' > /dev/null 2>&1; then
+        version=`echo $hgversion | cut -d'r' -f1`
+        type="rc`echo $hgversion | cut -d'c' -f2-`"
     else
         version=$hgversion
         type=''

mercurial/subrepo.py

@@ -404,7 +404,7 b' class hgsubrepo(abstractsubrepo):'
         super(hgsubrepo, self).__init__(ctx, path)
         self._state = state
         r = ctx.repo()
-        root = r.wjoin(path)
+        root = r.wjoin(util.localpath(path))
         create = allowcreate and not r.wvfs.exists('%s/.hg' % path)
         # repository constructor does expand variables in path, which is
         # unsafe since subrepo path might come from untrusted source.

tests/test-clonebundles.t

@@ -64,7 +64,7 b' Server is not running aborts'
   $ echo "http://localhost:$HGPORT1/bundle.hg" > server/.hg/clonebundles.manifest
   $ hg clone http://localhost:$HGPORT server-not-runner
   applying clone bundle from http://localhost:$HGPORT1/bundle.hg
-  error fetching bundle: (.* refused.*|Protocol not supported|(.* )?\$EADDRNOTAVAIL\$) (re)
+  error fetching bundle: (.* refused.*|Protocol not supported|(.* )?\$EADDRNOTAVAIL\$|.* No route to host) (re)
   abort: error applying bundle
   (if this error persists, consider contacting the server operator or disable clone bundles via "--config ui.clonebundles=false")
   [255]

tests/test-http-proxy.t

@@ -90,7 +90,7 b' bad host:port for proxy ("Protocol not s'
 misconfigured hosts)
 
   $ http_proxy=localhost:$HGPORT2 hg clone --config http_proxy.always=True http://localhost:$HGPORT/ f
-  abort: error: (Connection refused|Protocol not supported|.* actively refused it|\$EADDRNOTAVAIL\$) (re)
+  abort: error: (Connection refused|Protocol not supported|.* actively refused it|\$EADDRNOTAVAIL\$|No route to host) (re)
   [255]
 
 do not use the proxy if it is in the no list

tests/test-lfs-serve-access.t

@@ -84,6 +84,7 b' Reasonable hint for a misconfigured blob'
   $ hg -R httpclone update default --config lfs.url=http://localhost:$HGPORT2/missing
   abort: LFS error: *onnection *refused*! (glob) (?)
   abort: LFS error: $EADDRNOTAVAIL$! (glob) (?)
+  abort: LFS error: No route to host! (?)
   (the "lfs.url" config may be used to override http://localhost:$HGPORT2/missing)
   [255]