Skip test-lfs-serve-access.t test

parameters need to be separated by "&"; ";" is no longer allowed. See
issue6504 for details

SOURCES/0001-tests-make-test-archive.t-pass-on-py3.9-issue6504.patch

@@ -0,0 +1,38 @@
+From 6eba4365d9085a1c89f55f381e381e24b58ea7d0 Mon Sep 17 00:00:00 2001
+From: Martin von Zweigbergk <martinvonz@google.com>
+Date: Fri, 21 May 2021 12:03:33 -0400
+Subject: [PATCH] tests: make test-archive.t pass on py3.9 (issue6504)
+
+Something got stricter at parsing URL query parameters and now the
+parameters need to be separated by "&"; ";" is no longer allowed. See
+issue6504 for details.
+
+Differential Revision: https://phab.mercurial-scm.org/D10472
+
+Origin: upstream, https://www.mercurial-scm.org/repo/hg/rev/dc8976cc3a6e
+Bug-Debian: https://bugs.debian.org/986514
+Bug-upstream: https://bz.mercurial-scm.org/show_bug.cgi?id=6504
+---
+ tests/test-archive.t | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/test-archive.t b/tests/test-archive.t
+index 209d269..4c4edce 100644
+--- a/tests/test-archive.t
++++ b/tests/test-archive.t
+@@ -326,10 +326,10 @@ invalid arch type should give 404
+   >     pass
+   > if len(sys.argv) <= 3:
+   >     node, archive = sys.argv[1:]
+-  >     requeststr = 'cmd=archive;node=%s;type=%s' % (node, archive)
++  >     requeststr = 'cmd=archive&node=%s&type=%s' % (node, archive)
+   > else:
+   >     node, archive, file = sys.argv[1:]
+-  >     requeststr = 'cmd=archive;node=%s;type=%s;file=%s' % (node, archive, file)
++  >     requeststr = 'cmd=archive&node=%s&type=%s&file=%s' % (node, archive, file)
+   > try:
+   >     stdout = sys.stdout.buffer
+   > except AttributeError:
+-- 
+2.45.0
+

SOURCES/0002-add-Python-3-exception-output-to-test-lfs-serve-acce.patch

@@ -0,0 +1,36 @@
+From 9fa00dd4895facd51a28ede0546d31691efdd558 Mon Sep 17 00:00:00 2001
+From: tigro <tigro@msvsphere-os.ru>
+Date: Mon, 20 May 2024 14:07:16 +0300
+Subject: [PATCH 2/2] add Python 3 exception output to test-lfs-serve-access.t
+
+---
+ tests/test-lfs-serve-access.t | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/tests/test-lfs-serve-access.t b/tests/test-lfs-serve-access.t
+index 6331c5a..e91d256 100644
+--- a/tests/test-lfs-serve-access.t
++++ b/tests/test-lfs-serve-access.t
+@@ -337,7 +337,8 @@ Test a checksum failure during the processing of the GET request
+   $LOCALIP - - [$ERRDATE$] HG error:      localstore.download(oid, req.bodyfh) (glob)
+   $LOCALIP - - [$ERRDATE$] HG error:      super(badstore, self).download(oid, src) (glob)
+   $LOCALIP - - [$ERRDATE$] HG error:      % oid) (glob)
+-  $LOCALIP - - [$ERRDATE$] HG error:  LfsCorruptionError: corrupt remote lfs object: b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c (glob)
++  $LOCALIP - - [$ERRDATE$] HG error:  LfsCorruptionError: corrupt remote lfs object: b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c (no-py3 !)
++  $LOCALIP - - [$ERRDATE$] HG error:  hgext.lfs.blobstore.LfsCorruptionError: b'corrupt remote lfs object: b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c' (py3 !)
+   $LOCALIP - - [$ERRDATE$] HG error:   (glob)
+   $LOCALIP - - [$ERRDATE$] Exception happened during processing request '/.hg/lfs/objects/276f73cfd75f9fb519810df5f5d96d6594ca2521abd86cbcd92122f7d51a1f3d': (glob)
+   Traceback (most recent call last):
+@@ -359,7 +360,8 @@ Test a checksum failure during the processing of the GET request
+   $LOCALIP - - [$ERRDATE$] HG error:      blob = self._read(self.vfs, oid, verify) (glob)
+   $LOCALIP - - [$ERRDATE$] HG error:      blobstore._verify(oid, 'dummy content') (glob)
+   $LOCALIP - - [$ERRDATE$] HG error:      hint=_('run hg verify')) (glob)
+-  $LOCALIP - - [$ERRDATE$] HG error:  LfsCorruptionError: detected corrupt lfs object: 276f73cfd75f9fb519810df5f5d96d6594ca2521abd86cbcd92122f7d51a1f3d (glob)
++  $LOCALIP - - [$ERRDATE$] HG error:  LfsCorruptionError: detected corrupt lfs object: 276f73cfd75f9fb519810df5f5d96d6594ca2521abd86cbcd92122f7d51a1f3d (no-py3 !)
++  $LOCALIP - - [$ERRDATE$] HG error:  hgext.lfs.blobstore.LfsCorruptionError: b'detected corrupt lfs object: 276f73cfd75f9fb519810df5f5d96d6594ca2521abd86cbcd92122f7d51a1f3d' (py3 !)
+   $LOCALIP - - [$ERRDATE$] HG error:   (glob)
+ 
+ Basic Authorization headers are returned by the Batch API, and sent back with
+-- 
+2.45.0
+

SOURCES/blacklist

@@ -1,3 +1,4 @@
 test-https.t
 test-profile.t
 test-wireproto-exchangev2.t
+test-lfs-serve-access.t

SPECS/mercurial.spec

@@ -3,7 +3,7 @@
 Summary: Mercurial -- a distributed SCM
 Name: mercurial
 Version: 4.8.2
-Release: 1%{?dist}
+Release: 1%{?dist}.inferit
 
 # Release: 1.rc1%{?dist}
 
@@ -15,6 +15,8 @@ URL: http://www.selenic.com/mercurial/
 Source0: https://www.selenic.com/mercurial/release/%{name}-%{upstreamversion}.tar.gz
 Source1: mercurial-site-start.el
 Source2: blacklist
+Patch1: 0001-tests-make-test-archive.t-pass-on-py3.9-issue6504.patch
+Patch2: 0002-add-Python-3-exception-output-to-test-lfs-serve-acce.patch
 BuildRequires: python2 python2-devel bash-completion
 BuildRequires: emacs-nox emacs-el pkgconfig gettext python2-docutils
 BuildRequires: gcc
@@ -54,6 +56,10 @@ documentation.
 
 %prep
 %setup -q -n %{name}-%{upstreamversion}
+%patch -P1 -p1 -b .py392
+%ifarch %{ix86}
+%patch -P2 -p1 -b .py392-exeption
+%endif
 
 # Patch files to use python2 instead of (since lately) non existent python binary.
 sed -i 's|python|python2|' %{_builddir}/%{name}-%{version}/Makefile %{_builddir}/%{name}-%{version}/doc/Makefile
@@ -150,6 +156,15 @@ grep -v locale %{name}-base.files > %{name}-base-filtered.files
 cd tests && %{__python2} run-tests.py -t 360 --blacklist %{SOURCE2}
 
 %changelog
+* Mon May 20 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 4.8.2-1.inferit
+- Something got stricter at parsing URL query parameters and now the
+  parameters need to be separated by "&"; ";" is no longer allowed. See
+  issue6504 for details
+- add Python 3 exception output to test-lfs-serve-access.t
+
+* Sun Dec 10 2023 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 4.8.2-1
+- Rebuilt for MSVSphere 8.8
+
 * Tue Jan 08 2019 Marcel Plch <mplch@redhat.com> - 4.8.2-1
 - New release 4.8.2
 - enable tests