Re: [PR PATCH] [Updated] hg-git: update to 1.0.2.

[Luciogi <Luciogi@users.noreply.github.com>]

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

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

https://github.com/Luciogi/void-packages hg-git
https://github.com/void-linux/void-packages/pull/46887

hg-git: update to 1.0.2.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-GLIBC)



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

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

From 893a907f75a71ef6cfedd597f6ae421e689b5ea6 Mon Sep 17 00:00:00 2001
From: Luciogi <lucigithubcommit@skiff.com>
Date: Wed, 25 Oct 2023 14:43:58 +0500
Subject: [PATCH 1/2] hg-git: update to 1.0.2,

remove UPDATE
---
 srcpkgs/hg-git/template | 6 +++---
 srcpkgs/hg-git/update   | 2 --
 2 files changed, 3 insertions(+), 5 deletions(-)
 delete mode 100644 srcpkgs/hg-git/update

diff --git a/srcpkgs/hg-git/template b/srcpkgs/hg-git/template
index 50a4edaf92e70..8e85c423421c6 100644
--- a/srcpkgs/hg-git/template
+++ b/srcpkgs/hg-git/template
@@ -1,7 +1,7 @@
 # Template file for 'hg-git'
 pkgname=hg-git
-version=1.0.1
-revision=2
+version=1.0.2
+revision=1
 build_style=python3-pep517
 hostmakedepends="python3-setuptools_scm python3-wheel"
 depends="python3-dulwich mercurial"
@@ -13,7 +13,7 @@ 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=3f7360f5b0f5e805fb0c969cfd8d7af064962d32000f723568b6e56080d08b29
+checksum=5a840e87a70a15c9c1e06196bc3ed5955e772f11e9b1803e88c0c9f55af03416
 
 do_check() {
 	python3 tests/run-tests.py --with-hg=/usr/bin/hg
diff --git a/srcpkgs/hg-git/update b/srcpkgs/hg-git/update
deleted file mode 100644
index 9af058824bc0a..0000000000000
--- a/srcpkgs/hg-git/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="${homepage}/downloads/?tab=tags"
-pattern='/(get|downloads)/(v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\.tar)'

From b5a0d380842e86b4a84287f085db2794da97f984 Mon Sep 17 00:00:00 2001
From: Luciogi <lucigithubcommit@skiff.com>
Date: Thu, 26 Oct 2023 19:28:42 +0500
Subject: [PATCH 2/2] hg-git: update to 1.0.2, fix test, remove UPDATE file

---
 srcpkgs/hg-git/patches/fix_tests.patch | 55 ++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 srcpkgs/hg-git/patches/fix_tests.patch

diff --git a/srcpkgs/hg-git/patches/fix_tests.patch b/srcpkgs/hg-git/patches/fix_tests.patch
new file mode 100644
index 0000000000000..fa568256eb68e
--- /dev/null
+++ b/srcpkgs/hg-git/patches/fix_tests.patch
@@ -0,0 +1,55 @@
+# HG changeset patch
+# User Dan Villiom Podlaski Christiansen <danchr@gmail.com>
+# Date 1682100621 -7200
+#      Fri Apr 21 20:10:21 2023 +0200
+# Branch 1.0.x
+# Node ID 9a52223a95e9821b2f2b544ab5a35e06963da3f1
+# Parent  2528cff319744f44dc40003cd110700ce4204a94
+compat: fix tests with Mercurial default
+
+diff --git a/NEWS.rst b/NEWS.rst
+--- a/NEWS.rst
++++ b/NEWS.rst
+@@ -1,3 +1,10 @@
++hg-git 1.0.3 (unreleased)
++=========================
++
++This is a minor release, focusing on bugs and compatibility.
++
++* Fix tests with Mercurial 6.5
++
+ hg-git 1.0.2 (2023-03-03)
+ =========================
+ 
+diff --git a/hggit/gitrepo.py b/hggit/gitrepo.py
+--- a/hggit/gitrepo.py
++++ b/hggit/gitrepo.py
+@@ -103,7 +103,7 @@
+     def known(self):
+         raise NotImplementedError
+ 
+-    def peer(self, path=None):
++    def peer(self, path=None, remotehidden=False):
+         return self
+ 
+     def stream_out(self):
+@@ -136,8 +136,8 @@
+ 
+ # defend against tracebacks if we specify -r in 'hg pull'
+ @eh.wrapfunction(hg, b'addbranchrevs')
+-def safebranchrevs(orig, lrepo, otherrepo, branches, revs):
+-    revs, co = orig(lrepo, otherrepo, branches, revs)
++def safebranchrevs(orig, lrepo, otherrepo, branches, revs, **kwargs):
++    revs, co = orig(lrepo, otherrepo, branches, revs, **kwargs)
+     if isinstance(otherrepo, gitrepo):
+         # FIXME: Unless it's None, the 'co' result is passed to the lookup()
+         # remote command. Since our implementation of the lookup() remote
+@@ -245,5 +245,7 @@
+         )
+ 
+ 
+-def make_peer(ui, path, create, intents=None, createopts=None):
++def make_peer(
++    ui, path, create, intents=None, createopts=None, remotehidden=False
++):
+     return gitrepo(ui, path, create)