--- a/contrib/packaging/packagelib.sh Mon Feb 11 15:41:08 2019 +0300
+++ b/contrib/packaging/packagelib.sh Mon Feb 11 11:18:37 2019 -0500
@@ -28,9 +28,9 @@
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=''
--- a/mercurial/subrepo.py Mon Feb 11 15:41:08 2019 +0300
+++ b/mercurial/subrepo.py Mon Feb 11 11:18:37 2019 -0500
@@ -404,7 +404,7 @@
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.
--- a/tests/test-clonebundles.t Mon Feb 11 15:41:08 2019 +0300
+++ b/tests/test-clonebundles.t Mon Feb 11 11:18:37 2019 -0500
@@ -64,7 +64,7 @@
$ 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]
--- a/tests/test-http-proxy.t Mon Feb 11 15:41:08 2019 +0300
+++ b/tests/test-http-proxy.t Mon Feb 11 11:18:37 2019 -0500
@@ -90,7 +90,7 @@
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
--- a/tests/test-lfs-serve-access.t Mon Feb 11 15:41:08 2019 +0300
+++ b/tests/test-lfs-serve-access.t Mon Feb 11 11:18:37 2019 -0500
@@ -84,6 +84,7 @@
$ 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]