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 <ba...@jungle.org>" -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
