* Re: hg-git: update to 1.0.1.
2023-01-01 20:33 [PR PATCH] hg-git: update to 1.0.1 icp1994
@ 2023-01-01 20:39 ` icp1994
2023-01-02 3:25 ` kruceter
` (30 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: icp1994 @ 2023-01-01 20:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 223 bytes --]
New comment by icp1994 on void-packages repository
https://github.com/void-linux/void-packages/pull/41399#issuecomment-1368530635
Comment:
vsed unchanged files are errors now? I thought they were supposed to be warnings.
^ permalink raw reply [flat|nested] 33+ messages in thread* Re: hg-git: update to 1.0.1.
2023-01-01 20:33 [PR PATCH] hg-git: update to 1.0.1 icp1994
2023-01-01 20:39 ` icp1994
@ 2023-01-02 3:25 ` kruceter
2023-01-02 6:51 ` [PR PATCH] [Updated] " icp1994
` (29 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: kruceter @ 2023-01-02 3:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 390 bytes --]
New comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/41399#issuecomment-1368630939
Comment:
> vsed unchanged files are errors now?
This behavior is explicitly defined in `common/travis/build.sh` (pay attention to the `-s` option) and used in CI:
```sh
/hostrepo/xbps-src -j$(nproc) -s -H "$HOME"/hostdir $arch $test pkg "$pkg"
```
^ permalink raw reply [flat|nested] 33+ messages in thread* Re: [PR PATCH] [Updated] hg-git: update to 1.0.1.
2023-01-01 20:33 [PR PATCH] hg-git: update to 1.0.1 icp1994
2023-01-01 20:39 ` icp1994
2023-01-02 3:25 ` kruceter
@ 2023-01-02 6:51 ` icp1994
2023-01-11 17:40 ` [PR REVIEW] " Vaelatern
` (28 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: icp1994 @ 2023-01-02 6:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 479 bytes --]
There is an updated pull request by icp1994 against master on the void-packages repository
https://github.com/icp1994/void-packages hg-git
https://github.com/void-linux/void-packages/pull/41399
hg-git: update to 1.0.1.
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture: **x86_64**
A patch file from https://github.com/void-linux/void-packages/pull/41399.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-hg-git-41399.patch --]
[-- Type: text/x-diff, Size: 10286 bytes --]
From fe212a42d50213b29aa7abb2c0752cfd506feb49 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 2 Jan 2023 01:52:34 +0530
Subject: [PATCH 1/2] python3-dulwich: update to 0.20.50.
---
srcpkgs/python3-dulwich/template | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/python3-dulwich/template b/srcpkgs/python3-dulwich/template
index f1f45aeed9c9..154c5df96483 100644
--- a/srcpkgs/python3-dulwich/template
+++ b/srcpkgs/python3-dulwich/template
@@ -1,26 +1,24 @@
# Template file for 'python3-dulwich'
pkgname=python3-dulwich
-version=0.20.44
-revision=2
+version=0.20.50
+revision=1
build_style=python3-module
+make_check_target="dulwich/tests"
hostmakedepends="python3-setuptools"
makedepends="python3-devel"
-depends="python3-urllib3 python3-certifi"
-checkdepends="${depends} python3-gevent python3-gpg gnupg"
+depends="python3-urllib3"
+checkdepends="${depends} python3-pytest python3-gevent python3-gpg gnupg git"
short_desc="Python3 implementation of the Git file formats and protocols"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, Apache-2.0"
homepage="https://www.dulwich.io/"
+changelog="https://raw.githubusercontent.com/jelmer/dulwich/master/NEWS"
distfiles="${PYPI_SITE}/d/dulwich/dulwich-${version}.tar.gz"
-checksum=10e8d73763dd30c86a99a15ade8bfcf3ab8fe96532cdf497e8cb1d11832352b8
+checksum=50a941796b2c675be39be728d540c16b5b7ce77eb9e1b3f855650ece6832d2be
conflicts="python-dulwich>=0"
-do_check() {
- python3 -m unittest dulwich.tests.test_suite
-}
-
post_install() {
# remove extra docs
- rm -rf ${DESTDIR}/usr/lib/python*/site-packages/docs
+ rm -rf ${DESTDIR}/${py3_sitelib}/docs
}
From 56f2f9fd4b321fdcbbed9ed41e24f5f0036a4d12 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 2 Jan 2023 01:52:17 +0530
Subject: [PATCH 2/2] hg-git: update to 1.0.1.
---
.../patches/fix-egrep-test-errors.patch | 113 ++++++++++++++++++
.../hg-git/patches/fix-encoding-test.patch | 15 ---
srcpkgs/hg-git/template | 13 +-
3 files changed, 119 insertions(+), 22 deletions(-)
create mode 100644 srcpkgs/hg-git/patches/fix-egrep-test-errors.patch
delete mode 100644 srcpkgs/hg-git/patches/fix-encoding-test.patch
diff --git a/srcpkgs/hg-git/patches/fix-egrep-test-errors.patch b/srcpkgs/hg-git/patches/fix-egrep-test-errors.patch
new file mode 100644
index 000000000000..aeca5b20604c
--- /dev/null
+++ b/srcpkgs/hg-git/patches/fix-egrep-test-errors.patch
@@ -0,0 +1,113 @@
+--- a/tests/test-conflict-1.t
++++ b/tests/test-conflict-1.t
+@@ -16,13 +16,13 @@ Load commonly used test logic
+ $ hg ci -m "A->C"
+ created new head
+
+- $ hg merge -r1 2>&1 | sed 's/-C ./-C/' | egrep -v '^merging afile' | sed 's/incomplete.*/failed!/'
++ $ hg merge -r1 2>&1 | sed 's/-C ./-C/' | grep -E -v '^merging afile' | sed 's/incomplete.*/failed!/'
+ warning: conflicts.* (re)
+ 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
+ use 'hg resolve' to retry unresolved file merges or 'hg *' to abandon (glob)
+ resolve using first parent
+ $ echo C > afile
+- $ hg resolve -m afile | egrep -v 'no more unresolved files' || true
++ $ hg resolve -m afile | grep -E -v 'no more unresolved files' || true
+ $ hg ci -m "merge to C"
+
+ $ hg log --graph --style compact | sed 's/\[.*\]//g'
+
+--- a/tests/test-conflict-2.t
++++ b/tests/test-conflict-2.t
+@@ -16,13 +16,13 @@ Load commonly used test logic
+ $ hg ci -m "A->C"
+ created new head
+
+- $ hg merge -r1 2>&1 | sed 's/-C ./-C/' | egrep -v '^merging afile' | sed 's/incomplete.*/failed!/'
++ $ hg merge -r1 2>&1 | sed 's/-C ./-C/' | grep -E -v '^merging afile' | sed 's/incomplete.*/failed!/'
+ warning: conflicts.* (re)
+ 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
+ use 'hg resolve' to retry unresolved file merges or 'hg *' to abandon (glob)
+ resolve using second parent
+ $ echo B > afile
+- $ hg resolve -m afile | egrep -v 'no more unresolved files' || true
++ $ hg resolve -m afile | grep -E -v 'no more unresolved files' || true
+ $ hg ci -m "merge to B"
+
+ $ hg log --graph --style compact | sed 's/\[.*\]//g'
+
+--- a/tests/test-git-submodules.t
++++ b/tests/test-git-submodules.t
+@@ -27,10 +27,10 @@ version spell it sanely as it was given (eg . in a newer version,
+ while older git will use the full normalized path for .)
+ $ clonefilt='s/Cloning into/Initialized empty Git repository in/;s/in .*/in .../'
+
+- $ git clone ../gitrepo1 . 2>&1 | python -c "$rmpwd" | sed "$clonefilt" | egrep -v '^done\.$'
++ $ git clone ../gitrepo1 . 2>&1 | python -c "$rmpwd" | sed "$clonefilt" | grep -E -v '^done\.$'
+ Initialized empty Git repository in ...
+
+- $ git submodule add ../gitsubrepo subrepo 2>&1 | python -c "$rmpwd" | sed "$clonefilt" | egrep -v '^done\.$'
++ $ git submodule add ../gitsubrepo subrepo 2>&1 | python -c "$rmpwd" | sed "$clonefilt" | grep -E -v '^done\.$'
+ Initialized empty Git repository in ...
+
+ $ git commit -m 'add subrepo' | sed 's/, 0 deletions(-)//'
+@@ -48,7 +48,7 @@ while older git will use the full normalized path for .)
+ [master a000567] change subrepo commit
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+- $ git submodule add ../gitsubrepo subrepo2 2>&1 | python -c "$rmpwd" | sed "$clonefilt" | egrep -v '^done\.$'
++ $ git submodule add ../gitsubrepo subrepo2 2>&1 | python -c "$rmpwd" | sed "$clonefilt" | grep -E -v '^done\.$'
+ Initialized empty Git repository in ...
+
+ $ git commit -m 'add another subrepo' | sed 's/, 0 deletions(-)//'
+@@ -79,7 +79,7 @@ same name has existed at any point historically, so use alpha instead of subrepo
+
+ $ git rm alpha
+ rm 'alpha'
+- $ git submodule add ../gitsubrepo alpha 2>&1 | python -c "$rmpwd" | sed "$clonefilt" | egrep -v '^done\.$'
++ $ git submodule add ../gitsubrepo alpha 2>&1 | python -c "$rmpwd" | sed "$clonefilt" | grep -E -v '^done\.$'
+ Initialized empty Git repository in ...
+
+ $ git commit -m 'replace file with subrepo' | sed 's/, 0 deletions(-)//' | sed 's/, 0 insertions(+)//'
+@@ -98,7 +98,7 @@ replace symlink with subrepo
+
+ $ git rm foolink
+ rm 'foolink'
+- $ git submodule add ../gitsubrepo foolink 2>&1 | python -c "$rmpwd" | sed "$clonefilt" | egrep -v '^done\.$'
++ $ git submodule add ../gitsubrepo foolink 2>&1 | python -c "$rmpwd" | sed "$clonefilt" | grep -E -v '^done\.$'
+ Initialized empty Git repository in ...
+
+ $ git commit -m 'replace symlink with subrepo' | sed 's/, 0 deletions(-)//' | sed 's/, 0 insertions(+)//'
+
+--- a/tests/test-renames.t
++++ b/tests/test-renames.t
+@@ -39,7 +39,7 @@ Add a submodule (gitlink) and move it to a different spot:
+ $ rmpwd="import sys; print(sys.stdin.read().replace('$(dirname $(pwd))/', ''))"
+ $ clonefilt='s/Cloning into/Initialized empty Git repository in/;s/in .*/in .../'
+
+- $ git submodule add ../gitsubmodule 2>&1 | python -c "$rmpwd" | sed "$clonefilt" | egrep -v '^done\.$'
++ $ git submodule add ../gitsubmodule 2>&1 | python -c "$rmpwd" | sed "$clonefilt" | grep -E -v '^done\.$'
+ Initialized empty Git repository in ...
+
+ $ fn_git_commit -m 'add submodule'
+@@ -72,7 +72,7 @@ Rename the file back:
+ Rename a file elsewhere and replace it with a submodule:
+
+ $ git mv gamma gamma-new
+- $ git submodule add ../gitsubmodule gamma 2>&1 | python -c "$rmpwd" | sed "$clonefilt" | egrep -v '^done\.$'
++ $ git submodule add ../gitsubmodule gamma 2>&1 | python -c "$rmpwd" | sed "$clonefilt" | grep -E -v '^done\.$'
+ Initialized empty Git repository in ...
+
+ $ fn_git_commit -m 'rename and add submodule'
+
+--- a/tests/test-subrepos.t
++++ b/tests/test-subrepos.t
+@@ -33,7 +33,7 @@ Load commonly used test logic
+ * [new branch] master -> master
+ $ cd ..
+ Ensure gitlinks are transformed to .hgsubstate on hg pull from git
+- $ hg clone -u tip repo.git hgrepo 2>&1 | egrep -v '^(Cloning into|done)'
++ $ hg clone -u tip repo.git hgrepo 2>&1 | grep -E -v '^(Cloning into|done)'
+ importing 3 git commits
+ new changesets e532b2bfda10:88c5e06a2a29 (3 drafts)
+ updating to branch default
diff --git a/srcpkgs/hg-git/patches/fix-encoding-test.patch b/srcpkgs/hg-git/patches/fix-encoding-test.patch
deleted file mode 100644
index 944d4f2d96b3..000000000000
--- a/srcpkgs/hg-git/patches/fix-encoding-test.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/tests/test-encoding.t
-+++ b/tests/test-encoding.t
-@@ -33,10 +33,10 @@
- $ . $TESTDIR/latin-1-encoding
- Warning: commit message (did|does) not conform to UTF-8. (re)
- You may want to amend it after fixing the message, or set the config
-- variable i18n.commitencoding to the encoding your project uses.
-+ variable i18n.commitEncoding to the encoding your project uses.
- Warning: commit message (did|does) not conform to UTF-8. (re)
- You may want to amend it after fixing the message, or set the config
-- variable i18n.commitencoding to the encoding your project uses.
-+ variable i18n.commitEncoding to the encoding your project uses.
-
- $ cd ..
- $ git init -q --bare repo.git
diff --git a/srcpkgs/hg-git/template b/srcpkgs/hg-git/template
index 3d04ae447af6..9894f2771381 100644
--- a/srcpkgs/hg-git/template
+++ b/srcpkgs/hg-git/template
@@ -1,9 +1,9 @@
# Template file for 'hg-git'
pkgname=hg-git
-version=1.0.0
-revision=2
-build_style=python3-module
-hostmakedepends="python3-setuptools python3-setuptools_scm"
+version=1.0.1
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools_scm python3-wheel"
depends="python3-dulwich mercurial"
checkdepends="$depends git unzip openssh"
short_desc="Mercurial plugin adding the ability to push and pull to/from Git"
@@ -13,9 +13,8 @@ license="GPL-2.0-only"
homepage="https://foss.heptapod.net/mercurial/hg-git"
changelog="https://foss.heptapod.net/mercurial/hg-git/-/raw/branch/default/NEWS.rst"
distfiles="$PYPI_SITE/h/hg-git/hg-git-$version.tar.gz"
-checksum=3911833962eb9c899c6bea8fb49666c82f211b124d0840beb6ad95e23a4621b6
+checksum=3f7360f5b0f5e805fb0c969cfd8d7af064962d32000f723568b6e56080d08b29
do_check() {
- cd tests
- python3 run-tests.py --with-hg=/usr/bin/hg
+ python3 tests/run-tests.py --with-hg=/usr/bin/hg
}
^ permalink raw reply [flat|nested] 33+ messages in thread* Re: [PR REVIEW] hg-git: update to 1.0.1.
2023-01-01 20:33 [PR PATCH] hg-git: update to 1.0.1 icp1994
` (2 preceding siblings ...)
2023-01-02 6:51 ` [PR PATCH] [Updated] " icp1994
@ 2023-01-11 17:40 ` Vaelatern
2023-01-11 17:40 ` Vaelatern
` (27 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: Vaelatern @ 2023-01-11 17:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 516 bytes --]
New review comment by Vaelatern on void-packages repository
https://github.com/void-linux/void-packages/pull/41399#discussion_r1067279990
Comment:
I don't want to carry around `srcpkgs/hg-git/patches/fix-egrep-test-errors.patch` as a patch. It just changes `egrep` to `grep -E` I guess to avoid the GNU "egrep is depreciated" warning?
Could be an alias better, or a `sed` patch in a `pre` step.
Or merged upstream! That'd be nice. This problem is not unique to void, so we should not be carrying this patch.
^ permalink raw reply [flat|nested] 33+ messages in thread* Re: [PR REVIEW] hg-git: update to 1.0.1.
2023-01-01 20:33 [PR PATCH] hg-git: update to 1.0.1 icp1994
` (3 preceding siblings ...)
2023-01-11 17:40 ` [PR REVIEW] " Vaelatern
@ 2023-01-11 17:40 ` Vaelatern
2023-01-11 17:44 ` classabbyamp
` (26 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: Vaelatern @ 2023-01-11 17:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 279 bytes --]
New review comment by Vaelatern on void-packages repository
https://github.com/void-linux/void-packages/pull/41399#discussion_r1067281330
Comment:
If this were in a separate PR, which it probably should have been by the contributing guidelines, I'd merge this package already.
^ permalink raw reply [flat|nested] 33+ messages in thread* Re: [PR REVIEW] hg-git: update to 1.0.1.
2023-01-01 20:33 [PR PATCH] hg-git: update to 1.0.1 icp1994
` (4 preceding siblings ...)
2023-01-11 17:40 ` Vaelatern
@ 2023-01-11 17:44 ` classabbyamp
2023-01-11 18:27 ` CameronNemo
` (25 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: classabbyamp @ 2023-01-11 17:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 186 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/41399#discussion_r1067285373
Comment:
could this work with chroot-git?
^ permalink raw reply [flat|nested] 33+ messages in thread* Re: [PR REVIEW] hg-git: update to 1.0.1.
2023-01-01 20:33 [PR PATCH] hg-git: update to 1.0.1 icp1994
` (5 preceding siblings ...)
2023-01-11 17:44 ` classabbyamp
@ 2023-01-11 18:27 ` CameronNemo
2023-01-11 19:20 ` icp1994
` (24 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: CameronNemo @ 2023-01-11 18:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 486 bytes --]
New review comment by CameronNemo on void-packages repository
https://github.com/void-linux/void-packages/pull/41399#discussion_r1067324181
Comment:
Yes common practice is to prefix patches with an Upstream: and Source: header, e.g.
```diff
Upstream: yes/no
Source: <link to upstream commit/patch/request>
---
--- a/foo
+++ b/foo
...
```
If it has not been submitted upstream, best to explain why, or submit it yourself. I assume this patch would be acceptable upstream.
^ permalink raw reply [flat|nested] 33+ messages in thread* Re: [PR REVIEW] hg-git: update to 1.0.1.
2023-01-01 20:33 [PR PATCH] hg-git: update to 1.0.1 icp1994
` (6 preceding siblings ...)
2023-01-11 18:27 ` CameronNemo
@ 2023-01-11 19:20 ` icp1994
2023-01-11 19:40 ` Vaelatern
` (23 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: icp1994 @ 2023-01-11 19:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 433 bytes --]
New review comment by icp1994 on void-packages repository
https://github.com/void-linux/void-packages/pull/41399#discussion_r1067373517
Comment:
I also don't understand we should be needing this patch. egrep was explicitly patched in https://github.com/void-linux/void-packages/commit/ef5ffe4d696b31041c272be92e912fb454c075ac to avoid these kinds of issues. But the egrep in my masterdir doesn't seem to be affected by this patch.
^ permalink raw reply [flat|nested] 33+ messages in thread* Re: [PR REVIEW] hg-git: update to 1.0.1.
2023-01-01 20:33 [PR PATCH] hg-git: update to 1.0.1 icp1994
` (7 preceding siblings ...)
2023-01-11 19:20 ` icp1994
@ 2023-01-11 19:40 ` Vaelatern
2023-01-11 19:41 ` icp1994
` (22 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: Vaelatern @ 2023-01-11 19:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 242 bytes --]
New review comment by Vaelatern on void-packages repository
https://github.com/void-linux/void-packages/pull/41399#discussion_r1067389336
Comment:
`chroot-grep-3.8_1 /usr/bin/egrep`
I will accept a PR that patches chroot-grep too.
^ permalink raw reply [flat|nested] 33+ messages in thread* Re: [PR REVIEW] hg-git: update to 1.0.1.
2023-01-01 20:33 [PR PATCH] hg-git: update to 1.0.1 icp1994
` (8 preceding siblings ...)
2023-01-11 19:40 ` Vaelatern
@ 2023-01-11 19:41 ` icp1994
2023-01-11 19:44 ` Vaelatern
` (21 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: icp1994 @ 2023-01-11 19:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 282 bytes --]
New review comment by icp1994 on void-packages repository
https://github.com/void-linux/void-packages/pull/41399#discussion_r1067390289
Comment:
Doesn't look like I can set a custom git command for the tests. If it's removed there aren't any tests errors rather they are skipped.
^ permalink raw reply [flat|nested] 33+ messages in thread* Re: [PR REVIEW] hg-git: update to 1.0.1.
2023-01-01 20:33 [PR PATCH] hg-git: update to 1.0.1 icp1994
` (9 preceding siblings ...)
2023-01-11 19:41 ` icp1994
@ 2023-01-11 19:44 ` Vaelatern
2023-01-11 19:48 ` icp1994
` (20 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: Vaelatern @ 2023-01-11 19:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 190 bytes --]
New review comment by Vaelatern on void-packages repository
https://github.com/void-linux/void-packages/pull/41399#discussion_r1067392618
Comment:
Can you alias `git=/usr/bin/chroot-git`?
^ permalink raw reply [flat|nested] 33+ messages in thread* Re: [PR REVIEW] hg-git: update to 1.0.1.
2023-01-01 20:33 [PR PATCH] hg-git: update to 1.0.1 icp1994
` (10 preceding siblings ...)
2023-01-11 19:44 ` Vaelatern
@ 2023-01-11 19:48 ` icp1994
2023-01-11 19:50 ` Vaelatern
` (19 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: icp1994 @ 2023-01-11 19:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 440 bytes --]
New review comment by icp1994 on void-packages repository
https://github.com/void-linux/void-packages/pull/41399#discussion_r1067395791
Comment:
> grep 3.8 prints a warning to stderr that could potentially break some builds and the grep package patches it out, but I ran a world rebuild with chroot-grep 3.8 and everything built, so I didn't add the patch here.
From the chroot-grep update PR - is it okay to create a new pr for this?
^ permalink raw reply [flat|nested] 33+ messages in thread* Re: [PR REVIEW] hg-git: update to 1.0.1.
2023-01-01 20:33 [PR PATCH] hg-git: update to 1.0.1 icp1994
` (11 preceding siblings ...)
2023-01-11 19:48 ` icp1994
@ 2023-01-11 19:50 ` Vaelatern
2023-01-11 19:51 ` Vaelatern
` (18 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: Vaelatern @ 2023-01-11 19:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 153 bytes --]
New review comment by Vaelatern on void-packages repository
https://github.com/void-linux/void-packages/pull/41399#discussion_r1067397769
Comment:
Yes
^ permalink raw reply [flat|nested] 33+ messages in thread* Re: [PR REVIEW] hg-git: update to 1.0.1.
2023-01-01 20:33 [PR PATCH] hg-git: update to 1.0.1 icp1994
` (12 preceding siblings ...)
2023-01-11 19:50 ` Vaelatern
@ 2023-01-11 19:51 ` Vaelatern
2023-01-11 20:11 ` classabbyamp
` (17 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: Vaelatern @ 2023-01-11 19:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 205 bytes --]
New review comment by Vaelatern on void-packages repository
https://github.com/void-linux/void-packages/pull/41399#discussion_r1067398239
Comment:
Link it to me on IRC or here and I'll be happy to merge
^ permalink raw reply [flat|nested] 33+ messages in thread* Re: [PR REVIEW] hg-git: update to 1.0.1.
2023-01-01 20:33 [PR PATCH] hg-git: update to 1.0.1 icp1994
` (13 preceding siblings ...)
2023-01-11 19:51 ` Vaelatern
@ 2023-01-11 20:11 ` classabbyamp
2023-01-11 21:34 ` CameronNemo
` (16 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: classabbyamp @ 2023-01-11 20:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 225 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/41399#discussion_r1067414468
Comment:
you can set PATH in the template: `PATH="/usr/libexec/chroot-git:$PATH"`
^ permalink raw reply [flat|nested] 33+ messages in thread* Re: [PR REVIEW] hg-git: update to 1.0.1.
2023-01-01 20:33 [PR PATCH] hg-git: update to 1.0.1 icp1994
` (14 preceding siblings ...)
2023-01-11 20:11 ` classabbyamp
@ 2023-01-11 21:34 ` CameronNemo
2023-01-11 21:39 ` Vaelatern
` (15 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: CameronNemo @ 2023-01-11 21:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 353 bytes --]
New review comment by CameronNemo on void-packages repository
https://github.com/void-linux/void-packages/pull/41399#discussion_r1067478648
Comment:
Why does this need to be a separate PR? `hg-git` is the only package that pulls in `python3-dulwich`. Presumably you would be testing the upgraded software all at once, rather than in all combinations.
^ permalink raw reply [flat|nested] 33+ messages in thread* Re: [PR REVIEW] hg-git: update to 1.0.1.
2023-01-01 20:33 [PR PATCH] hg-git: update to 1.0.1 icp1994
` (15 preceding siblings ...)
2023-01-11 21:34 ` CameronNemo
@ 2023-01-11 21:39 ` Vaelatern
2023-01-12 7:28 ` icp1994
` (14 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: Vaelatern @ 2023-01-11 21:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 161 bytes --]
New review comment by Vaelatern on void-packages repository
https://github.com/void-linux/void-packages/pull/41399#discussion_r1067483321
Comment:
Good point!
^ permalink raw reply [flat|nested] 33+ messages in thread* Re: [PR REVIEW] hg-git: update to 1.0.1.
2023-01-01 20:33 [PR PATCH] hg-git: update to 1.0.1 icp1994
` (16 preceding siblings ...)
2023-01-11 21:39 ` Vaelatern
@ 2023-01-12 7:28 ` icp1994
2023-01-12 7:41 ` icp1994
` (13 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: icp1994 @ 2023-01-12 7:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 202 bytes --]
New review comment by icp1994 on void-packages repository
https://github.com/void-linux/void-packages/pull/41399#discussion_r1067783129
Comment:
https://github.com/void-linux/void-packages/pull/41593
^ permalink raw reply [flat|nested] 33+ messages in thread* Re: [PR REVIEW] hg-git: update to 1.0.1.
2023-01-01 20:33 [PR PATCH] hg-git: update to 1.0.1 icp1994
` (17 preceding siblings ...)
2023-01-12 7:28 ` icp1994
@ 2023-01-12 7:41 ` icp1994
2023-01-12 9:15 ` paper42
` (12 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: icp1994 @ 2023-01-12 7:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 213 bytes --]
New review comment by icp1994 on void-packages repository
https://github.com/void-linux/void-packages/pull/41399#discussion_r1067791818
Comment:
~20% of the tests which requires git are failing with chroot-git.
^ permalink raw reply [flat|nested] 33+ messages in thread* Re: [PR REVIEW] hg-git: update to 1.0.1.
2023-01-01 20:33 [PR PATCH] hg-git: update to 1.0.1 icp1994
` (18 preceding siblings ...)
2023-01-12 7:41 ` icp1994
@ 2023-01-12 9:15 ` paper42
2023-01-12 9:15 ` paper42
` (11 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: paper42 @ 2023-01-12 9:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 247 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/41399#discussion_r1067875616
Comment:
Is this a hard error or just warnings? In every single other package, it's just a harmless warning.
^ permalink raw reply [flat|nested] 33+ messages in thread* Re: [PR REVIEW] hg-git: update to 1.0.1.
2023-01-01 20:33 [PR PATCH] hg-git: update to 1.0.1 icp1994
` (19 preceding siblings ...)
2023-01-12 9:15 ` paper42
@ 2023-01-12 9:15 ` paper42
2023-01-12 13:03 ` icp1994
` (10 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: paper42 @ 2023-01-12 9:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 289 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/41399#discussion_r1067875616
Comment:
Is this a hard error or just warnings? In every single other package, it's just a harmless warning. This should definitely be fixed upstream.
^ permalink raw reply [flat|nested] 33+ messages in thread* Re: [PR REVIEW] hg-git: update to 1.0.1.
2023-01-01 20:33 [PR PATCH] hg-git: update to 1.0.1 icp1994
` (20 preceding siblings ...)
2023-01-12 9:15 ` paper42
@ 2023-01-12 13:03 ` icp1994
2023-01-12 13:31 ` paper42
` (9 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: icp1994 @ 2023-01-12 13:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 725 bytes --]
New review comment by icp1994 on void-packages repository
https://github.com/void-linux/void-packages/pull/41399#discussion_r1068097015
Comment:
The tests work by comparing stdout with the expected result. Since the warnings get posted in stdout, it no longer matches the expected value. Last time I [updated](https://github.com/void-linux/void-packages/commit/e851fe63829a092a79798cc4f355398e73d0fc5f) it, a patch was needed for the tests due to mismatched git version from upstream. It got [fixed upstream](https://foss.heptapod.net/mercurial/hg-git/-/commit/5277b791c8e79568832785560cac491d72044534) in this release when their git version caught up to ours. So I expect this to will be fixed when they move to grep-3.8.
^ permalink raw reply [flat|nested] 33+ messages in thread* Re: [PR REVIEW] hg-git: update to 1.0.1.
2023-01-01 20:33 [PR PATCH] hg-git: update to 1.0.1 icp1994
` (21 preceding siblings ...)
2023-01-12 13:03 ` icp1994
@ 2023-01-12 13:31 ` paper42
2023-01-12 13:34 ` paper42
` (8 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: paper42 @ 2023-01-12 13:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 224 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/41399#discussion_r1068124533
Comment:
The warnings from grep go to stderr, so they are not an issue in most cases.
^ permalink raw reply [flat|nested] 33+ messages in thread* Re: [PR REVIEW] hg-git: update to 1.0.1.
2023-01-01 20:33 [PR PATCH] hg-git: update to 1.0.1 icp1994
` (22 preceding siblings ...)
2023-01-12 13:31 ` paper42
@ 2023-01-12 13:34 ` paper42
2023-01-12 13:51 ` icp1994
` (7 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: paper42 @ 2023-01-12 13:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 328 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/41399#discussion_r1068124533
Comment:
The warnings from grep go to stderr, so they are not an issue in most cases. I am afraid they might not notice this because most distributions seem to be patching this warning out.
^ permalink raw reply [flat|nested] 33+ messages in thread* Re: [PR REVIEW] hg-git: update to 1.0.1.
2023-01-01 20:33 [PR PATCH] hg-git: update to 1.0.1 icp1994
` (23 preceding siblings ...)
2023-01-12 13:34 ` paper42
@ 2023-01-12 13:51 ` icp1994
2023-01-12 14:06 ` paper42
` (6 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: icp1994 @ 2023-01-12 13:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1064 bytes --]
New review comment by icp1994 on void-packages repository
https://github.com/void-linux/void-packages/pull/41399#discussion_r1068145221
Comment:
Okay, then they are tracking the stderr as well. All the test fails the same way:
```patch
--- /builddir/hg-git-1.0.1/tests/test-renames.t
+++ /builddir/hg-git-1.0.1/tests/test-renames.t.err
@@ -40,6 +40,7 @@
$ clonefilt='s/Cloning into/Initialized empty Git repository in/;s/in .*/in .../'
$ git submodule add ../gitsubmodule 2>&1 | python -c "$rmpwd" | sed "$clonefilt" | egrep -v '^done\.$'
+ egrep: warning: egrep is obsolescent; using grep -E
Initialized empty Git repository in ...
$ fn_git_commit -m 'add submodule'
@@ -73,6 +74,7 @@
$ git mv gamma gamma-new
$ git submodule add ../gitsubmodule gamma 2>&1 | python -c "$rmpwd" | sed "$clonefilt" | egrep -v '^done\.$'
+ egrep: warning: egrep is obsolescent; using grep -E
Initialized empty Git repository in ...
$ fn_git_commit -m 'rename and add submodule'
ERROR: test-renames.t output changed
```
^ permalink raw reply [flat|nested] 33+ messages in thread* Re: [PR REVIEW] hg-git: update to 1.0.1.
2023-01-01 20:33 [PR PATCH] hg-git: update to 1.0.1 icp1994
` (24 preceding siblings ...)
2023-01-12 13:51 ` icp1994
@ 2023-01-12 14:06 ` paper42
2023-01-12 18:31 ` paper42
` (5 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: paper42 @ 2023-01-12 14:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 215 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/41399#discussion_r1068164661
Comment:
Could you send the patch upstream? If not, I can do it later today.
^ permalink raw reply [flat|nested] 33+ messages in thread* Re: [PR REVIEW] hg-git: update to 1.0.1.
2023-01-01 20:33 [PR PATCH] hg-git: update to 1.0.1 icp1994
` (25 preceding siblings ...)
2023-01-12 14:06 ` paper42
@ 2023-01-12 18:31 ` paper42
2023-01-12 18:31 ` paper42
` (4 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: paper42 @ 2023-01-12 18:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 258 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/41399#discussion_r1068480283
Comment:
This is now not an issue because it was fixed in chroot-grep, but sending the PR upstream would still be nice.
^ permalink raw reply [flat|nested] 33+ messages in thread* Re: [PR REVIEW] hg-git: update to 1.0.1.
2023-01-01 20:33 [PR PATCH] hg-git: update to 1.0.1 icp1994
` (26 preceding siblings ...)
2023-01-12 18:31 ` paper42
@ 2023-01-12 18:31 ` paper42
2023-01-12 18:32 ` icp1994
` (3 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: paper42 @ 2023-01-12 18:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 294 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/41399#discussion_r1068480283
Comment:
This is now not an issue because it was fixed in chroot-grep, so we can ignore issues gh-git has, but sending the PR upstream would still be nice.
^ permalink raw reply [flat|nested] 33+ messages in thread* Re: [PR REVIEW] hg-git: update to 1.0.1.
2023-01-01 20:33 [PR PATCH] hg-git: update to 1.0.1 icp1994
` (27 preceding siblings ...)
2023-01-12 18:31 ` paper42
@ 2023-01-12 18:32 ` icp1994
2023-01-12 18:46 ` [PR PATCH] [Updated] " icp1994
` (2 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: icp1994 @ 2023-01-12 18:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 277 bytes --]
New review comment by icp1994 on void-packages repository
https://github.com/void-linux/void-packages/pull/41399#discussion_r1068482041
Comment:
I made [an issue](https://foss.heptapod.net/mercurial/hg-git/-/issues/400) first asking if they will be accepting patch for this.
^ permalink raw reply [flat|nested] 33+ messages in thread* Re: [PR PATCH] [Updated] hg-git: update to 1.0.1.
2023-01-01 20:33 [PR PATCH] hg-git: update to 1.0.1 icp1994
` (28 preceding siblings ...)
2023-01-12 18:32 ` icp1994
@ 2023-01-12 18:46 ` icp1994
2023-01-13 17:34 ` Vaelatern
2023-01-15 1:37 ` [PR PATCH] [Merged]: " Vaelatern
31 siblings, 0 replies; 33+ messages in thread
From: icp1994 @ 2023-01-12 18:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 479 bytes --]
There is an updated pull request by icp1994 against master on the void-packages repository
https://github.com/icp1994/void-packages hg-git
https://github.com/void-linux/void-packages/pull/41399
hg-git: update to 1.0.1.
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture: **x86_64**
A patch file from https://github.com/void-linux/void-packages/pull/41399.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-hg-git-41399.patch --]
[-- Type: text/x-diff, Size: 4248 bytes --]
From f4bb48c6173ee83e33cd07cb8e7d5ef1d4f87927 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 2 Jan 2023 01:52:34 +0530
Subject: [PATCH 1/2] python3-dulwich: update to 0.20.50.
---
srcpkgs/python3-dulwich/template | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/python3-dulwich/template b/srcpkgs/python3-dulwich/template
index f1f45aeed9c9..154c5df96483 100644
--- a/srcpkgs/python3-dulwich/template
+++ b/srcpkgs/python3-dulwich/template
@@ -1,26 +1,24 @@
# Template file for 'python3-dulwich'
pkgname=python3-dulwich
-version=0.20.44
-revision=2
+version=0.20.50
+revision=1
build_style=python3-module
+make_check_target="dulwich/tests"
hostmakedepends="python3-setuptools"
makedepends="python3-devel"
-depends="python3-urllib3 python3-certifi"
-checkdepends="${depends} python3-gevent python3-gpg gnupg"
+depends="python3-urllib3"
+checkdepends="${depends} python3-pytest python3-gevent python3-gpg gnupg git"
short_desc="Python3 implementation of the Git file formats and protocols"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, Apache-2.0"
homepage="https://www.dulwich.io/"
+changelog="https://raw.githubusercontent.com/jelmer/dulwich/master/NEWS"
distfiles="${PYPI_SITE}/d/dulwich/dulwich-${version}.tar.gz"
-checksum=10e8d73763dd30c86a99a15ade8bfcf3ab8fe96532cdf497e8cb1d11832352b8
+checksum=50a941796b2c675be39be728d540c16b5b7ce77eb9e1b3f855650ece6832d2be
conflicts="python-dulwich>=0"
-do_check() {
- python3 -m unittest dulwich.tests.test_suite
-}
-
post_install() {
# remove extra docs
- rm -rf ${DESTDIR}/usr/lib/python*/site-packages/docs
+ rm -rf ${DESTDIR}/${py3_sitelib}/docs
}
From b48aeac1840fc10f45e59d6fde577d2a6b087fac Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 2 Jan 2023 01:52:17 +0530
Subject: [PATCH 2/2] hg-git: update to 1.0.1.
---
srcpkgs/hg-git/patches/fix-encoding-test.patch | 15 ---------------
srcpkgs/hg-git/template | 13 ++++++-------
2 files changed, 6 insertions(+), 22 deletions(-)
delete mode 100644 srcpkgs/hg-git/patches/fix-encoding-test.patch
diff --git a/srcpkgs/hg-git/patches/fix-encoding-test.patch b/srcpkgs/hg-git/patches/fix-encoding-test.patch
deleted file mode 100644
index 944d4f2d96b3..000000000000
--- a/srcpkgs/hg-git/patches/fix-encoding-test.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/tests/test-encoding.t
-+++ b/tests/test-encoding.t
-@@ -33,10 +33,10 @@
- $ . $TESTDIR/latin-1-encoding
- Warning: commit message (did|does) not conform to UTF-8. (re)
- You may want to amend it after fixing the message, or set the config
-- variable i18n.commitencoding to the encoding your project uses.
-+ variable i18n.commitEncoding to the encoding your project uses.
- Warning: commit message (did|does) not conform to UTF-8. (re)
- You may want to amend it after fixing the message, or set the config
-- variable i18n.commitencoding to the encoding your project uses.
-+ variable i18n.commitEncoding to the encoding your project uses.
-
- $ cd ..
- $ git init -q --bare repo.git
diff --git a/srcpkgs/hg-git/template b/srcpkgs/hg-git/template
index 3d04ae447af6..9894f2771381 100644
--- a/srcpkgs/hg-git/template
+++ b/srcpkgs/hg-git/template
@@ -1,9 +1,9 @@
# Template file for 'hg-git'
pkgname=hg-git
-version=1.0.0
-revision=2
-build_style=python3-module
-hostmakedepends="python3-setuptools python3-setuptools_scm"
+version=1.0.1
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools_scm python3-wheel"
depends="python3-dulwich mercurial"
checkdepends="$depends git unzip openssh"
short_desc="Mercurial plugin adding the ability to push and pull to/from Git"
@@ -13,9 +13,8 @@ license="GPL-2.0-only"
homepage="https://foss.heptapod.net/mercurial/hg-git"
changelog="https://foss.heptapod.net/mercurial/hg-git/-/raw/branch/default/NEWS.rst"
distfiles="$PYPI_SITE/h/hg-git/hg-git-$version.tar.gz"
-checksum=3911833962eb9c899c6bea8fb49666c82f211b124d0840beb6ad95e23a4621b6
+checksum=3f7360f5b0f5e805fb0c969cfd8d7af064962d32000f723568b6e56080d08b29
do_check() {
- cd tests
- python3 run-tests.py --with-hg=/usr/bin/hg
+ python3 tests/run-tests.py --with-hg=/usr/bin/hg
}
^ permalink raw reply [flat|nested] 33+ messages in thread* Re: hg-git: update to 1.0.1.
2023-01-01 20:33 [PR PATCH] hg-git: update to 1.0.1 icp1994
` (29 preceding siblings ...)
2023-01-12 18:46 ` [PR PATCH] [Updated] " icp1994
@ 2023-01-13 17:34 ` Vaelatern
2023-01-15 1:37 ` [PR PATCH] [Merged]: " Vaelatern
31 siblings, 0 replies; 33+ messages in thread
From: Vaelatern @ 2023-01-13 17:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 204 bytes --]
New comment by Vaelatern on void-packages repository
https://github.com/void-linux/void-packages/pull/41399#issuecomment-1382175452
Comment:
Unless someone says otherwise, I'll be merging this tomorrow
^ permalink raw reply [flat|nested] 33+ messages in thread* Re: [PR PATCH] [Merged]: hg-git: update to 1.0.1.
2023-01-01 20:33 [PR PATCH] hg-git: update to 1.0.1 icp1994
` (30 preceding siblings ...)
2023-01-13 17:34 ` Vaelatern
@ 2023-01-15 1:37 ` Vaelatern
31 siblings, 0 replies; 33+ messages in thread
From: Vaelatern @ 2023-01-15 1:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 324 bytes --]
There's a merged pull request on the void-packages repository
hg-git: update to 1.0.1.
https://github.com/void-linux/void-packages/pull/41399
Description:
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture: **x86_64**
^ permalink raw reply [flat|nested] 33+ messages in thread