From d31a01e32a1b48a6e2fb85cdd9ae4bf085a03f16 Mon Sep 17 00:00:00 2001
From: konstin <konstin@mailbox.org>
Date: Wed, 24 Jul 2024 13:05:10 +0200
Subject: [PATCH] Use fork preferences in resolution

With this change, the "preferences-dependent-forking" packse scenario becomes stable.
---
 crates/uv-resolver/src/resolver/mod.rs | 12 +++++++++++-
 crates/uv/src/commands/project/lock.rs |  4 ++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/crates/uv-resolver/src/resolver/mod.rs b/crates/uv-resolver/src/resolver/mod.rs
index ad5260f6a2f5..cb1e8575e7e3 100644
--- a/crates/uv-resolver/src/resolver/mod.rs
+++ b/crates/uv-resolver/src/resolver/mod.rs
@@ -324,7 +324,17 @@ impl<InstalledPackages: InstalledPackagesProvider> ResolverState<InstalledPackag
             self.requires_python.clone(),
         );
         let mut preferences = self.preferences.clone();
-        let mut forked_states = vec![state];
+        let mut forked_states = if let ResolverMarkers::Universal {
+            fork_preferences: Some(fork_preferences),
+        } = &self.markers
+        {
+            fork_preferences
+                .iter()
+                .map(|fork_preference| state.clone().with_markers(fork_preference.clone()))
+                .collect()
+        } else {
+            vec![state]
+        };
         let mut resolutions = vec![];
 
         'FORK: while let Some(mut state) = forked_states.pop() {
diff --git a/crates/uv/src/commands/project/lock.rs b/crates/uv/src/commands/project/lock.rs
index f57ca934f81c..013e4695345e 100644
--- a/crates/uv/src/commands/project/lock.rs
+++ b/crates/uv/src/commands/project/lock.rs
@@ -440,7 +440,7 @@ async fn do_lock(
                 &Reinstall::default(),
                 upgrade,
                 None,
-                resolver_markers,
+                resolver_markers.clone(),
                 python_requirement.clone(),
                 &client,
                 &flat_index,
@@ -516,7 +516,7 @@ async fn do_lock(
                 &Reinstall::default(),
                 upgrade,
                 None,
-                ResolverMarkers::universal(None),
+                resolver_markers,
                 python_requirement,
                 &client,
                 &flat_index,