[PR PATCH] mercurial: update to 5.7.1.

[PR PATCH] mercurial: update to 5.7.1.

[mobinmob]

[-- Attachment #1: Type: text/plain, Size: 1593 bytes --]

There is a new pull request by mobinmob against master on the void-packages repository

https://github.com/mobinmob/void-packages mercurial
https://github.com/void-linux/void-packages/pull/30109

mercurial: update to 5.7.1.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [X] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/30109.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mercurial-30109.patch --]
[-- Type: text/x-diff, Size: 1055 bytes --]

From a2d70f1c31f08a7f7040993bdd412780ced0bc5c Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 9 Apr 2021 13:06:15 +0300
Subject: [PATCH] mercurial: update to 5.7.1.

---
 srcpkgs/mercurial/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mercurial/template b/srcpkgs/mercurial/template
index a8b24bffbee2..066c9c28efe6 100644
--- a/srcpkgs/mercurial/template
+++ b/srcpkgs/mercurial/template
@@ -1,6 +1,6 @@
 # Template file for 'mercurial'
 pkgname=mercurial
-version=5.6.1
+version=5.7.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3 python3-setuptools python3-devel"
@@ -12,7 +12,7 @@ maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://www.mercurial-scm.org/"
 distfiles="https://www.mercurial-scm.org/release/mercurial-${version}.tar.gz"
-checksum=e55c254f4904c45226a106780e57f4279aee03368f6ff6a981d5d2a38243ffad
+checksum=cb5139144ccb2ef648f36963c8606d47dea1cb0e22aa2c055d6f860ce3fde7b0
 
 do_check() {
 	cd tests

Re: mercurial: update to 5.7.1.

[Chocimier]

[-- Attachment #1: Type: text/plain, Size: 566 bytes --]

New comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/30109#issuecomment-816810017

Comment:
Another testcase to remove (and report upstream if you care enough).

We could use something like below to lower tests times. Taken from `run-tests.py`.

        if [ "$XBPS_CHECK_PKGS" = full ]; then
                python3 run-tests.py ${makejobs}
        else
                echo More will be run with XBPS_CHECK_PKGS=full
                python3 run-tests.py ${makejobs} test-s*
        fi

@jnbr, @ericonr 

Re: mercurial: update to 5.7.1.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 204 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/30109#issuecomment-816814618

Comment:
I think I found a fix for the EADDRINUSE failures, testing now.

Re: mercurial: update to 5.7.1.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 342 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/30109#issuecomment-816815509

Comment:
I would use `XBPS_CHECK_PKGS=full` to enable even more tests, they have a flag for those:

```
Skipped test-verify-repo-operations.py: missing feature: allow slow tests (use --allow-slow-tests)
```

Re: mercurial: update to 5.7.1.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 1764 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/30109#issuecomment-816831246

Comment:
```
diff --git a/srcpkgs/mercurial/template b/srcpkgs/mercurial/template
index a8b24bffbe..5144dfbef2 100644
--- a/srcpkgs/mercurial/template
+++ b/srcpkgs/mercurial/template
@@ -3,10 +3,11 @@ pkgname=mercurial
 version=5.6.1
 revision=1
 build_style=python3-module
-hostmakedepends="python3 python3-setuptools python3-devel"
+hostmakedepends="python3 python3-setuptools python3-devel gettext"
 makedepends="python3-devel"
 depends="python3 ca-certificates"
-checkdepends="iana-etc tar unzip which xz"
+checkdepends="iana-etc tar unzip which xz cvs subversion-python python3-docutils gnupg2
+ python3-Pygments"
 short_desc="Fast, lightweight source control management system"
 maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="GPL-2.0-or-later"
@@ -14,10 +15,21 @@ homepage="https://www.mercurial-scm.org/"
 distfiles="https://www.mercurial-scm.org/release/mercurial-${version}.tar.gz"
 checksum=e55c254f4904c45226a106780e57f4279aee03368f6ff6a981d5d2a38243ffad
 
+pre_check() {
+	if [ "$XBPS_TARGET_LIBC" = musl ]; then
+		# fix hardcoded strerror() value from glibc
+		vsed -e 's/Address already in use/Address in use/' -i tests/common-pattern.py
+	fi
+}
+
 do_check() {
+	if [ "$XBPS_CHECK_PKGS" = full ]; then
+		_additional_test=--allow-slow-tests
+	fi
+
 	cd tests
 	rm test-doctest.py test-hghave.t test-https.t test-merge-tools.t test-persistent-nodemap.t
-	python3 run-tests.py ${makejobs}
+	python3 run-tests.py ${makejobs} ${_additional_test}
 }
 
 post_install() {
```

I'm not sure about the new dependencies, though, the `cvs` tests at least fail here.

Re: mercurial: update to 5.7.1.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 317 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/30109#issuecomment-816832180

Comment:
And `test-archive` is full of:

```
-  HTTP Error 404: file(s) not found: relre:baz
+  HTTP Error 400: no such method: archive;node=1701ef1f1510;type=gz;file=relre:baz
```

Re: mercurial: update to 5.7.1.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 1860 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/30109#issuecomment-816841194

Comment:
Final patch, I think:

```diff
diff --git a/srcpkgs/mercurial/template b/srcpkgs/mercurial/template
index a8b24bffbe..e4d8a31ae6 100644
--- a/srcpkgs/mercurial/template
+++ b/srcpkgs/mercurial/template
@@ -3,10 +3,12 @@ pkgname=mercurial
 version=5.6.1
 revision=1
 build_style=python3-module
-hostmakedepends="python3 python3-setuptools python3-devel"
+hostmakedepends="python3 python3-setuptools python3-devel gettext"
 makedepends="python3-devel"
 depends="python3 ca-certificates"
-checkdepends="iana-etc tar unzip which xz"
+# cvs tests fail
+checkdepends="iana-etc tar unzip which xz subversion-python python3-docutils gnupg2
+ python3-Pygments"
 short_desc="Fast, lightweight source control management system"
 maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="GPL-2.0-or-later"
@@ -14,10 +16,22 @@ homepage="https://www.mercurial-scm.org/"
 distfiles="https://www.mercurial-scm.org/release/mercurial-${version}.tar.gz"
 checksum=e55c254f4904c45226a106780e57f4279aee03368f6ff6a981d5d2a38243ffad
 
+pre_check() {
+	if [ "$XBPS_TARGET_LIBC" = musl ]; then
+		# fix hardcoded strerror() value from glibc
+		vsed -e 's/Address already in use/Address in use/' -i tests/common-pattern.py
+	fi
+}
+
 do_check() {
+	if [ "$XBPS_CHECK_PKGS" = full ]; then
+		_additional_test=--allow-slow-tests
+	fi
+
 	cd tests
-	rm test-doctest.py test-hghave.t test-https.t test-merge-tools.t test-persistent-nodemap.t
-	python3 run-tests.py ${makejobs}
+	rm test-doctest.py test-hghave.t test-https.t test-merge-tools.t \
+	 test-merge-combination.t test-persistent-nodemap.t test-archive.t
+	python3 run-tests.py ${makejobs} ${_additional_test}
 }
 
 post_install() {
```

Re: [PR PATCH] [Updated] mercurial: update to 5.7.1.

[mobinmob]

[-- Attachment #1: Type: text/plain, Size: 1598 bytes --]

There is an updated pull request by mobinmob against master on the void-packages repository

https://github.com/mobinmob/void-packages mercurial
https://github.com/void-linux/void-packages/pull/30109

mercurial: update to 5.7.1.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [X] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/30109.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mercurial-30109.patch --]
[-- Type: text/x-diff, Size: 2068 bytes --]

From 3233a359f6074f9f287eec9bf9cfa39a6a9895f9 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 9 Apr 2021 13:06:15 +0300
Subject: [PATCH] mercurial: update to 5.7.1.

---
 srcpkgs/mercurial/template | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/mercurial/template b/srcpkgs/mercurial/template
index a8b24bffbee2..9b8cadbcfb88 100644
--- a/srcpkgs/mercurial/template
+++ b/srcpkgs/mercurial/template
@@ -1,23 +1,37 @@
 # Template file for 'mercurial'
 pkgname=mercurial
-version=5.6.1
+version=5.7.1
 revision=1
 build_style=python3-module
-hostmakedepends="python3 python3-setuptools python3-devel"
+hostmakedepends="python3 python3-setuptools python3-devel gettext"
 makedepends="python3-devel"
 depends="python3 ca-certificates"
-checkdepends="iana-etc tar unzip which xz"
+# cvs tests fail
+checkdepends="iana-etc tar unzip which xz subversion-python python3-docutils gnupg2
+ python3-Pygments"
 short_desc="Fast, lightweight source control management system"
 maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://www.mercurial-scm.org/"
 distfiles="https://www.mercurial-scm.org/release/mercurial-${version}.tar.gz"
-checksum=e55c254f4904c45226a106780e57f4279aee03368f6ff6a981d5d2a38243ffad
+checksum=cb5139144ccb2ef648f36963c8606d47dea1cb0e22aa2c055d6f860ce3fde7b0
+
+pre_check() {
+	if [ "$XBPS_TARGET_LIBC" = musl ]; then
+		# fix hardcoded strerror() value from glibc
+		vsed -e 's/Address already in use/Address in use/' -i tests/common-pattern.py
+	fi
+}
 
 do_check() {
-	cd tests
-	rm test-doctest.py test-hghave.t test-https.t test-merge-tools.t test-persistent-nodemap.t
-	python3 run-tests.py ${makejobs}
+	if [ "$XBPS_CHECK_PKGS" = full ]; then
+		_additional_test=--allow-slow-tests
+	fi
+
+ 	cd tests
+	rm test-doctest.py test-hghave.t test-https.t test-merge-tools.t \
+	 test-merge-combination.t test-persistent-nodemap.t test-archive.t
+	python3 run-tests.py ${makejobs} ${_additional_test}
 }
 
 post_install() {

Re: [PR REVIEW] mercurial: update to 5.7.1.

[Chocimier]

[-- Attachment #1: Type: text/plain, Size: 226 bytes --]

New review comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/30109#discussion_r610942627

Comment:
No such file `test-merge-combination.t`, and no similar named test fail here.

Re: [PR REVIEW] mercurial: update to 5.7.1.

[Chocimier]

[-- Attachment #1: Type: text/plain, Size: 238 bytes --]

New review comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/30109#discussion_r610942476

Comment:
else `_additional_test='test-s*'`, then please try to run tests localy, it is much faster

Re: [PR REVIEW] mercurial: update to 5.7.1.

[Chocimier]

[-- Attachment #1: Type: text/plain, Size: 177 bytes --]

New review comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/30109#discussion_r615295859

Comment:
@ericonr, could you explain?

Re: [PR REVIEW] mercurial: update to 5.7.1.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 228 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/30109#discussion_r615297906

Comment:
I'm not sure, sorry. It was a name that appeared when I was running them locally.

Re: mercurial: update to 5.7.1.

[mobinmob]

[-- Attachment #1: Type: text/plain, Size: 212 bytes --]

New comment by mobinmob on void-packages repository

https://github.com/void-linux/void-packages/pull/30109#issuecomment-841718300

Comment:
Superseded by https://github.com/void-linux/void-packages/pull/30916 .

Re: [PR PATCH] [Closed]: mercurial: update to 5.7.1.

[mobinmob]

[-- Attachment #1: Type: text/plain, Size: 1438 bytes --]

There's a closed pull request on the void-packages repository

mercurial: update to 5.7.1.
https://github.com/void-linux/void-packages/pull/30109

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [X] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->