mercurial: update to 6.5.2

This commit is contained in:
Coral Pink 2023-10-12 01:05:53 +02:00 committed by Piraty
parent c9c373535b
commit f93483e3d4
3 changed files with 38 additions and 5 deletions

View file

@ -0,0 +1,4 @@
test-merge-tools.t
test-profile.t # https://bz.mercurial-scm.org/show_bug.cgi?id=6846
test-status.t # ci
test-status-eacces.t # ci

View file

@ -0,0 +1,30 @@
--- ./tests/hghave.py 2023-10-11 02:51:10.038038013 +0200
+++ ./tests/hghave.py 2023-10-11 02:50:44.353035951 +0200
@@ -868,7 +868,7 @@
# Add "py36", "py37", ... as possible feature checks. Note that there's no
# punctuation here.
-@checkvers("py", "Python >= %s", (3.6, 3.7, 3.8, 3.9, 3.10, 3.11))
+@checkvers("py", "Python >= %s", (3.6, 3.7, 3.8, 3.9, 3.10, 3.11, 3.12))
def has_python_range(v):
major, minor = v.split('.')[0:2]
py_major, py_minor = sys.version_info.major, sys.version_info.minor
--- ./tests/test-remotefilelog-gc.t 2023-10-11 03:20:30.678179308 +0200
+++ ./tests/test-remotefilelog-gc.t 2023-10-11 03:20:23.587178739 +0200
@@ -106,6 +106,11 @@
# Test that warning is displayed when the repo path is malformed
$ printf "asdas\0das" >> $CACHEDIR/repos
+#if py312
+ $ hg gc
+ abort: invalid path asdas\x00da: .*(null|NULL).* (re)
+ [255]
+#else
#if py311
$ hg gc
finished: removed 0 of 4 files (0.00 GB to 0.00 GB)
@@ -114,3 +119,4 @@
abort: invalid path asdas\x00da: .*(null|NULL).* (re)
[255]
#endif
+#endif

View file

@ -1,7 +1,7 @@
# Template file for 'mercurial'
pkgname=mercurial
version=6.5
revision=2
version=6.5.2
revision=1
build_style=python3-module
hostmakedepends="python3 python3-setuptools python3-devel gettext git"
makedepends="python3-devel"
@ -14,7 +14,7 @@ maintainer="dataCobra <datacobra@thinkbot.de>"
license="GPL-2.0-or-later"
homepage="https://www.mercurial-scm.org/"
distfiles="https://www.mercurial-scm.org/release/mercurial-${version}.tar.gz"
checksum=a5603d0d395ebf67fe5d27abbb3bd37fcc01871ecf394c793672d2c1e68be7e7
checksum=afc39d7067976593c8332b8e97a12afd393b55037c5fb9c3cab1a42c7560f60a
pre_check() {
if [ "$XBPS_TARGET_LIBC" = musl ]; then
@ -31,8 +31,7 @@ do_check() {
fi
cd tests
rm test-hghave.t test-merge-tools.t test-status.t test-status-eacces.t
PATH=/tmp/bin:$PATH python3 run-tests.py ${makejobs} ${_additional_test}
PATH=/tmp/bin:$PATH python3 run-tests.py --blacklist "${FILESDIR}/tests_blacklist" ${makejobs} ${_additional_test}
}
post_install() {