Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

hg-git: update to 1.0.2. #46887

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
55 changes: 55 additions & 0 deletions srcpkgs/hg-git/patches/fix_tests.patch
Original file line number Diff line number Diff line change
@@ -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)
6 changes: 3 additions & 3 deletions srcpkgs/hg-git/template
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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
Expand Down
2 changes: 0 additions & 2 deletions srcpkgs/hg-git/update

This file was deleted.