diff rust/hg-core/src/dirstate_tree/status.rs @ 49845:e0c0545e2e55

branching: merge stable into default

--- a/rust/hg-core/src/dirstate_tree/status.rs	Tue Jan 03 11:53:35 2023 -0500
+++ b/rust/hg-core/src/dirstate_tree/status.rs	Wed Jan 04 16:02:22 2023 +0100
@@ -55,7 +55,7 @@
     // instantiated in `rhg` or some other caller.
     // TODO find the underlying cause and fix it, then remove this.
     rayon::ThreadPoolBuilder::new()
-        .num_threads(16)
+        .num_threads(16.min(rayon::current_num_threads()))
         .build_global()
         .ok();