Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package mercurial-extension-hg-git for openSUSE:Factory checked in at 2023-08-28 17:14:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mercurial-extension-hg-git (Old) and /work/SRC/openSUSE:Factory/.mercurial-extension-hg-git.new.1766 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mercurial-extension-hg-git" Mon Aug 28 17:14:06 2023 rev:10 rq:1105967 version:1.0.2 Changes: -------- --- /work/SRC/openSUSE:Factory/mercurial-extension-hg-git/mercurial-extension-hg-git.changes 2023-03-06 18:56:40.465008526 +0100 +++ /work/SRC/openSUSE:Factory/.mercurial-extension-hg-git.new.1766/mercurial-extension-hg-git.changes 2023-08-28 17:14:07.886315673 +0200 @@ -1,0 +2,6 @@ +Fri Aug 25 22:02:17 UTC 2023 - Lukas Müller <expee...@outlook.com> + +- Make tests actually run by adding "BuildRequires: python3-dulwich". +- Add unreleased upstream patch fix_mercurial_6.5_compatibility.patch. + +------------------------------------------------------------------- New: ---- fix_mercurial_6.5_compatibility.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mercurial-extension-hg-git.spec ++++++ --- /var/tmp/diff_new_pack.G04eDd/_old 2023-08-28 17:14:09.010356037 +0200 +++ /var/tmp/diff_new_pack.G04eDd/_new 2023-08-28 17:14:09.018356325 +0200 @@ -32,11 +32,14 @@ URL: http://foss.heptapod.net/mercurial/hg-git Source0: https://files.pythonhosted.org/packages/source/h/hg-git/hg-git-%{version}.tar.gz Source90: tests.blacklist +# Unreleased upstream patch +Patch0: fix_mercurial_6.5_compatibility.patch BuildRequires: fdupes BuildRequires: git BuildRequires: mercurial BuildRequires: python-rpm-macros BuildRequires: python3 +BuildRequires: python3-dulwich >= 0.19.3 BuildRequires: python3-gpg BuildRequires: python3-pip BuildRequires: python3-setuptools @@ -48,7 +51,7 @@ %endif BuildRequires: unzip Requires: mercurial -Requires: python3-dulwich >= 0.19.0 +Requires: python3-dulwich >= 0.19.3 Provides: python3-hg-git = %{version}-%{release} Obsoletes: python3-hg-git < %{version}-%{release} BuildArch: noarch @@ -60,6 +63,7 @@ %prep %setup -q -n hg-git-%{version} +%patch0 -p1 %build %pyproject_wheel ++++++ fix_mercurial_6.5_compatibility.patch ++++++ # HG changeset patch # User Dan Villiom Podlaski Christiansen <dan...@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)