Your message dated Fri, 08 Nov 2019 16:37:23 +0000
with message-id <[email protected]>
and subject line Bug#944362: fixed in hgsubversion 1.9.3+git20190419+6a6ce-2
has caused the Debian Bug report #944362,
regarding hgsubversion: incompatible with mercurial 5.2
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)


-- 
944362: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=944362
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: hgsubversion
Version: 1.9.3+git20190419+6a6ce-1
Severity: grave
Tags: bullseye sid

The current version of hgsubversion in sid doesn't work with hg 5.2, as
evidence by the autopkgtest failing.

Specifically, the mercurial.repository module moved to
mercurial.interfaces.repository.  Changing that in
hgsubversion/svnrepo.py lets the autopkgtest pass:

--- hgsubversion-1.9.3+git20190419+6a6ce.orig/hgsubversion/svnrepo.py
+++ hgsubversion-1.9.3+git20190419+6a6ce/hgsubversion/svnrepo.py
@@ -23,7 +23,7 @@ from mercurial import util as hgutil
 peerapi = 0
 try:
     try:
-        from mercurial.repository import peer as peerrepository
+        from mercurial.interfaces.repository import peer as peerrepository
         peerapi = 1
     except ImportError:
         from mercurial.peer import peerrepository

(Obviously this breaks earlier versions but should be easy enough to fix
up)

Incidentally, I made some changes to the test to clean up better when it
fails:

diff -Nru hgsubversion-1.9.3+git20190419+6a6ce/debian/tests/hgsubversion 
hgsubversion-1.9.3+git20190419+6a6ce/debian/tests/hgsubversion
--- hgsubversion-1.9.3+git20190419+6a6ce/debian/tests/hgsubversion      
2019-09-16 19:30:22.000000000 +0200
+++ hgsubversion-1.9.3+git20190419+6a6ce/debian/tests/hgsubversion      
2019-11-08 16:03:13.000000000 +0100
@@ -3,10 +3,18 @@
 set -e
 
 SVN_ROOT=$(mktemp --tmpdir -d hgsubversion.XXXXX)
-mkdir -p $SVN_ROOT
+testdir=$(pwd)
 
 PID_FILE=/tmp/svnmock.pid
 
+cleanup () {
+       # Kill the server and cleanup
+       kill $(cat $PID_FILE)
+       rm -rf $SVN_ROOT
+       rm -rf $testdir/celesteville
+}
+trap cleanup EXIT
+
 # Create a local svn server with an empty repo
 svnadmin create $SVN_ROOT/celesteville
 cat > $SVN_ROOT/celesteville/conf/svnserve.conf << EOF
@@ -33,10 +41,4 @@
 echo Arthur >> people
 hg commit -u "Babar <[email protected]>" -m "Add more people"
 hg --config extensions.hgsubversion= push
-cd ..
-
-# Kill the server and cleanup
-kill $(cat $PID_FILE)
-rm -rf $SVN_ROOT
 
-rm -r celesteville


-- System Information:
Debian Release: bullseye/sid
  APT prefers testing-debug
  APT policy: (500, 'testing-debug'), (500, 'stable-updates'), (500, 
'stable-debug'), (500, 'testing'), (500, 'stable'), (101, 'unstable')
Architecture: amd64 (x86_64)

Kernel: Linux 5.2.0-3-amd64 (SMP w/28 CPU cores)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE, 
TAINT_UNSIGNED_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US:en (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled

Versions of packages hgsubversion depends on:
ii  mercurial         5.2-1
ii  python            2.7.17-1
ii  python-subvertpy  0.10.1-3
ii  subversion        1.10.6-1+b1

hgsubversion recommends no packages.

hgsubversion suggests no packages.

-- no debconf information

--- End Message ---
--- Begin Message ---
Source: hgsubversion
Source-Version: 1.9.3+git20190419+6a6ce-2

We believe that the bug you reported is fixed in the latest version of
hgsubversion, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Andrej Shadura <[email protected]> (supplier of updated hgsubversion package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Format: 1.8
Date: Fri, 08 Nov 2019 17:12:17 +0100
Source: hgsubversion
Architecture: source
Version: 1.9.3+git20190419+6a6ce-2
Distribution: unstable
Urgency: medium
Maintainer: Andrej Shadura <[email protected]>
Changed-By: Andrej Shadura <[email protected]>
Closes: 944362
Changes:
 hgsubversion (1.9.3+git20190419+6a6ce-2) unstable; urgency=medium
 .
   [ Julien Cristau ]
   * Fix peerrepository import (Closes: #944362).
   * Clean up better after autopkgtest fails.
 .
   [ Andrej Shadura ]
   * Require Mercurial 5.2.
Checksums-Sha1:
 1f96a244cb64a043fbba3fb37a2dff68ac078dad 1988 
hgsubversion_1.9.3+git20190419+6a6ce-2.dsc
 f516c522f1982080489b0c5ef0fe9fa699c84a88 4604 
hgsubversion_1.9.3+git20190419+6a6ce-2.debian.tar.xz
Checksums-Sha256:
 8e41efb341f2e6db4209bea5ad02f26a63409016ec1e50321872daaf455ff78c 1988 
hgsubversion_1.9.3+git20190419+6a6ce-2.dsc
 472b7a75d73eb26145b55d49b8052eed776b1a5080ad271a651d53227a2f4516 4604 
hgsubversion_1.9.3+git20190419+6a6ce-2.debian.tar.xz
Files:
 5e9170578a0911dfb892721f0b68b50e 1988 vcs optional 
hgsubversion_1.9.3+git20190419+6a6ce-2.dsc
 bff3f56059866288d210f1ce685b0ba3 4604 vcs optional 
hgsubversion_1.9.3+git20190419+6a6ce-2.debian.tar.xz

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEEeuS9ZL8A0js0NGiOXkCM2RzYOdIFAl3FlOkACgkQXkCM2RzY
OdJcNQgAghsJKYnqd0IErmBlSyGjF/6DNO05YXyxNU126qLrYkPXnW5eyaBfIvsS
l+YOY9udMRatAd4rpYp1uEdPyQFtdOWJ3g7Tj/ulc+VxAUwV0JiV/SeJqDHl8MKT
Pkoj1wtHDjf76zXXR4/7mnwWlny2D3t+CYsIbg5IBHqjICEgxZ5xZ0xKT1dQEEgc
QSTcO0lrqJzVs5yd2UjoDYQEC+V+C0CIwkQgpi3mdV4WnrIYyecxE8oKBICE2j+q
VSHg1GpBjsPsitWmiZPyAg0uubTD2qdhXD5ahyITZwGAG2GQ8wwGUgBj/XoXHQKf
bsuGVcLD9EnjobLSW+pEiFFFZsq9rw==
=wtUm
-----END PGP SIGNATURE-----

--- End Message ---

Reply via email to