The attached patch (also available on https://salsa.debian.org/python-team/packages/hg-git/-/merge_requests/3) fixes the compatibility with the new Dulwich API and should allow both Dulwich and hg-git to migrate to testing.
I couldn't easily work out how to prevent DeprecationWarnings from breaking the tests, so I'll file a separate (normal severity) bug about that. Tristan, are you happy for me to upload the package with that change? -- Jelmer Vernooij <[email protected]> PGP Key: https://www.jelmer.uk/D729A457.asc
=== modified file 'debian/changelog'
--- old/debian/changelog 2020-09-24 06:48:41 +0000
+++ new/debian/changelog 2020-10-30 00:05:53 +0000
@@ -1,10 +1,15 @@
hg-git (0.9.0-2) UNRELEASED; urgency=medium
+ [ Ondřej Nový ]
* d/control: Update Maintainer field with new Debian Python Team
contact address.
* d/control: Update Vcs-* fields with new Debian Python Team Salsa
layout.
+ [ Jelmer Vernooij ]
+ * Add patch 0003-dulwich-compat.patch: avoid deprecation warning with newer
+ versions of Dulwich. Closes: #972793
+
-- Ondřej Nový <[email protected]> Thu, 24 Sep 2020 08:48:41 +0200
hg-git (0.9.0-1) unstable; urgency=medium
=== modified file 'debian/control'
--- old/debian/control 2020-09-24 06:48:41 +0000
+++ new/debian/control 2020-10-30 00:05:53 +0000
@@ -10,7 +10,7 @@
python3-mercurial,
openssh-client,
python3,
- python3-dulwich,
+ python3-dulwich (>= 0.20.6),
python3-setuptools,
unzip,
Standards-Version: 4.5.0
@@ -23,7 +23,7 @@
Architecture: all
Depends:
python3-mercurial,
- python3-dulwich (>= 0.9.7),
+ python3-dulwich (>= 0.20.6),
${misc:Depends},
${python3:Depends},
Description: Git plugin for Mercurial
=== added file 'debian/patches/0003-dulwich-compat.patch'
--- old/debian/patches/0003-dulwich-compat.patch 1970-01-01 00:00:00 +0000
+++ new/debian/patches/0003-dulwich-compat.patch 2020-10-30 00:05:53 +0000
@@ -0,0 +1,13 @@
+=== modified file 'hggit/git_handler.py'
+--- old/hggit/git_handler.py 2020-08-13 11:43:06 +0000
++++ new/hggit/git_handler.py 2020-10-29 23:50:16 +0000
+@@ -1113,7 +1113,7 @@
+
+ try:
+ new_refs = client.send_pack(path, changed, genpack,
+- progress=callback)
++ progress=callback).refs
+ if len(change_totals) > 0:
+ self.ui.status(_(b"added %d commits with %d trees"
+ b" and %d blobs\n") %
+
=== modified file 'debian/patches/series'
--- old/debian/patches/series 2020-08-13 14:15:34 +0000
+++ new/debian/patches/series 2020-10-30 00:05:53 +0000
@@ -1,2 +1,3 @@
0001-Set-explicit-merge-messages.patch
0002-Silence-git-pull-warning.patch
+0003-dulwich-compat.patch
signature.asc
Description: PGP signature
