changeset 52132:e08c878b5571

branching: merge stable into default

Hopefully this will bring the last changes necessary to make the 3.13 tests
green (on Linux).

--- a/mercurial/wireprototypes.py	Fri Oct 25 23:46:20 2024 -0400
+++ b/mercurial/wireprototypes.py	Sat Oct 26 23:33:19 2024 +0200
@@ -417,7 +417,7 @@
             )
             % config,
             hint=_(b'usable compression engines: %s')
-            % b', '.sorted(validnames),  # pytype: disable=attribute-error
+            % b', '.join(sorted(validnames)),
         )
 
     return compengines

--- a/mercurial/worker.py	Fri Oct 25 23:46:20 2024 -0400
+++ b/mercurial/worker.py	Sat Oct 26 23:33:19 2024 +0200
@@ -14,6 +14,7 @@
 import sys
 import threading
 import time
+import warnings
 
 from .i18n import _
 from . import (
@@ -23,6 +24,18 @@
     scmutil,
 )
 
+# XXX TODO: We should seriously look into this fork + thread issues, however
+# this is wreaking havoc in the tests suites, so silencing for now.
+warnings.filterwarnings(
+    'ignore',
+    message=(
+        r'This process \(pid=\d+\) is multi-threaded,'
+        r' use of fork\(\) may lead to deadlocks in the child.'
+    ),
+    category=DeprecationWarning,
+    module='mercurial.worker',
+)
+
 
 def countcpus():
     '''try to count the number of CPUs on the system'''

--- a/tests/test-flagprocessor.t	Fri Oct 25 23:46:20 2024 -0400
+++ b/tests/test-flagprocessor.t	Sat Oct 26 23:33:19 2024 +0200
@@ -203,20 +203,8 @@
   > extension=$TESTDIR/flagprocessorext.py
   > duplicate=$TESTDIR/flagprocessorext.py
   > EOF
-  $ hg debugrebuilddirstate
-  Traceback (most recent call last):
-    File "*/mercurial/extensions.py", line *, in _runextsetup (glob) (no-pyoxidizer !)
-    File "mercurial.extensions", line *, in _runextsetup (glob) (pyoxidizer !)
-      extsetup(ui)
+  $ hg debugrebuilddirstate 2>&1 | grep -E 'cannot register multiple processors|flagprocessorext'
     File "*/tests/flagprocessorext.py", line *, in extsetup (glob)
-      flagutil.addflagprocessor( (py38 !)
-      validatehash, (no-py38 !)
-    File "*/mercurial/revlogutils/flagutil.py", line *, in addflagprocessor (glob) (no-pyoxidizer !)
-    File "mercurial.revlogutils.flagutil", line *, in addflagprocessor (glob) (pyoxidizer !)
-      insertflagprocessor(flag, processor, flagprocessors)
-    File "*/mercurial/revlogutils/flagutil.py", line *, in insertflagprocessor (glob) (no-pyoxidizer !)
-    File "mercurial.revlogutils.flagutil", line *, in insertflagprocessor (glob) (pyoxidizer !)
-      raise error.Abort(msg)
   mercurial.error.Abort: cannot register multiple processors on flag '0x8'.
   *** failed to set up extension duplicate: cannot register multiple processors on flag '0x8'.
   $ hg st 2>&1 | grep -E 'cannot register multiple processors|flagprocessorext'

--- a/tests/test-parseindex2.py	Fri Oct 25 23:46:20 2024 -0400
+++ b/tests/test-parseindex2.py	Sat Oct 26 23:33:19 2024 +0200
@@ -222,7 +222,6 @@
         # Test different major-minor versions.
         self.assertversionfail(3, makehex(major + 1, minor, micro))
         self.assertversionfail(4, makehex(major, minor + 1, micro))
-        self.assertversionfail(5, "'foo'")
 
     def testbadargs(self):
         # Check that parse_index2() raises TypeError on bad arguments.