Rename to --fork-strategy

Author: charliermarsh

crates/uv-cli/src/lib.rs

@@ -19,9 +19,7 @@ use uv_normalize::{ExtraName, GroupName, PackageName};
 use uv_pep508::Requirement;
 use uv_pypi_types::VerbatimParsedUrl;
 use uv_python::{PythonDownloads, PythonPreference, PythonVersion};
-use uv_resolver::{
-    AnnotationStyle, ExcludeNewer, MultiVersionMode, PrereleaseMode, ResolutionMode,
-};
+use uv_resolver::{AnnotationStyle, ExcludeNewer, ForkStrategy, PrereleaseMode, ResolutionMode};
 use uv_static::EnvVars;
 
 pub mod comma;
@@ -4050,17 +4048,20 @@ pub struct ToolUpgradeArgs {
     /// The strategy to use when selecting multiple versions of a given package across Python
     /// versions and platforms.
     ///
-    /// By default, uv will optimize for selecting the latest version of each package, for each
-    /// supported Python version (`requires-python`). Under `fewest`, uv will minimize the number of
+    /// By default, uv will optimize for selecting the latest version of each package for each
+    /// supported Python version (`requires-python`), while minimizing the number of selected
+    /// versions across platforms.
+    ///
+    /// Under `fewest`, uv will minimize the number of
     /// selected versions for each package, preferring older versions that are compatible with a
     /// wider range of supported Python versions or platforms.
     #[arg(
         long,
         value_enum,
-        env = EnvVars::UV_MULTI_VERSION,
+        env = EnvVars::UV_FORK_STRATEGY,
         help_heading = "Resolver options"
     )]
-    pub multi_version: Option<MultiVersionMode>,
+    pub fork_strategy: Option<ForkStrategy>,
 
     /// Settings to pass to the PEP 517 build backend, specified as `KEY=VALUE` pairs.
     #[arg(
@@ -4854,17 +4855,20 @@ pub struct ResolverArgs {
     /// The strategy to use when selecting multiple versions of a given package across Python
     /// versions and platforms.
     ///
-    /// By default, uv will optimize for selecting the latest version of each package, for each
-    /// supported Python version (`requires-python`). Under `fewest`, uv will minimize the number of
+    /// By default, uv will optimize for selecting the latest version of each package for each
+    /// supported Python version (`requires-python`), while minimizing the number of selected
+    /// versions across platforms.
+    ///
+    /// Under `fewest`, uv will minimize the number of
     /// selected versions for each package, preferring older versions that are compatible with a
     /// wider range of supported Python versions or platforms.
     #[arg(
         long,
         value_enum,
-        env = EnvVars::UV_MULTI_VERSION,
+        env = EnvVars::UV_FORK_STRATEGY,
         help_heading = "Resolver options"
     )]
-    pub multi_version: Option<MultiVersionMode>,
+    pub fork_strategy: Option<ForkStrategy>,
 
     /// Settings to pass to the PEP 517 build backend, specified as `KEY=VALUE` pairs.
     #[arg(
@@ -5041,17 +5045,20 @@ pub struct ResolverInstallerArgs {
     /// The strategy to use when selecting multiple versions of a given package across Python
     /// versions and platforms.
     ///
-    /// By default, uv will optimize for selecting the latest version of each package, for each
-    /// supported Python version (`requires-python`). Under `fewest`, uv will minimize the number of
+    /// By default, uv will optimize for selecting the latest version of each package for each
+    /// supported Python version (`requires-python`), while minimizing the number of selected
+    /// versions across platforms.
+    ///
+    /// Under `fewest`, uv will minimize the number of
     /// selected versions for each package, preferring older versions that are compatible with a
     /// wider range of supported Python versions or platforms.
     #[arg(
         long,
         value_enum,
-        env = EnvVars::UV_MULTI_VERSION,
+        env = EnvVars::UV_FORK_STRATEGY,
         help_heading = "Resolver options"
     )]
-    pub multi_version: Option<MultiVersionMode>,
+    pub fork_strategy: Option<ForkStrategy>,
 
     /// Settings to pass to the PEP 517 build backend, specified as `KEY=VALUE` pairs.
     #[arg(

crates/uv-cli/src/options.rs

@@ -43,7 +43,7 @@ impl From<ResolverArgs> for PipOptions {
             resolution,
             prerelease,
             pre,
-            multi_version,
+            fork_strategy,
             config_setting,
             no_build_isolation,
             no_build_isolation_package,
@@ -59,7 +59,7 @@ impl From<ResolverArgs> for PipOptions {
             index_strategy,
             keyring_provider,
             resolution,
-            multi_version,
+            fork_strategy,
             prerelease: if pre {
                 Some(PrereleaseMode::Allow)
             } else {
@@ -128,7 +128,7 @@ impl From<ResolverInstallerArgs> for PipOptions {
             resolution,
             prerelease,
             pre,
-            multi_version,
+            fork_strategy,
             config_setting,
             no_build_isolation,
             no_build_isolation_package,
@@ -153,7 +153,7 @@ impl From<ResolverInstallerArgs> for PipOptions {
             } else {
                 prerelease
             },
-            multi_version,
+            fork_strategy,
             config_settings: config_setting
                 .map(|config_settings| config_settings.into_iter().collect::<ConfigSettings>()),
             no_build_isolation: flag(no_build_isolation, build_isolation),
@@ -239,7 +239,7 @@ pub fn resolver_options(
         resolution,
         prerelease,
         pre,
-        multi_version,
+        fork_strategy,
         config_setting,
         no_build_isolation,
         no_build_isolation_package,
@@ -296,7 +296,7 @@ pub fn resolver_options(
         } else {
             prerelease
         },
-        multi_version,
+        fork_strategy,
         dependency_metadata: None,
         config_settings: config_setting
             .map(|config_settings| config_settings.into_iter().collect::<ConfigSettings>()),
@@ -330,7 +330,7 @@ pub fn resolver_installer_options(
         resolution,
         prerelease,
         pre,
-        multi_version,
+        fork_strategy,
         config_setting,
         no_build_isolation,
         no_build_isolation_package,
@@ -399,7 +399,7 @@ pub fn resolver_installer_options(
         } else {
             prerelease
         },
-        multi_version,
+        fork_strategy,
         dependency_metadata: None,
         config_settings: config_setting
             .map(|config_settings| config_settings.into_iter().collect::<ConfigSettings>()),

crates/uv-resolver/src/multi_version_mode.rs renamed to crates/uv-resolver/src/fork_strategy.rs

@@ -2,7 +2,7 @@
 #[serde(deny_unknown_fields, rename_all = "kebab-case")]
 #[cfg_attr(feature = "clap", derive(clap::ValueEnum))]
 #[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
-pub enum MultiVersionMode {
+pub enum ForkStrategy {
     /// Optimize for selecting the fewest number of versions for each package. Older versions may
     /// be preferred if they are compatible with a wider range of supported Python versions or
     /// platforms.
@@ -13,7 +13,7 @@ pub enum MultiVersionMode {
     RequiresPython,
 }
 
-impl std::fmt::Display for MultiVersionMode {
+impl std::fmt::Display for ForkStrategy {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
             Self::Fewest => write!(f, "fewest"),

crates/uv-resolver/src/lib.rs

@@ -3,12 +3,12 @@ pub use error::{NoSolutionError, NoSolutionHeader, ResolveError, SentinelRange};
 pub use exclude_newer::ExcludeNewer;
 pub use exclusions::Exclusions;
 pub use flat_index::{FlatDistributions, FlatIndex};
+pub use fork_strategy::ForkStrategy;
 pub use lock::{
     InstallTarget, Lock, LockError, LockVersion, PackageMap, RequirementsTxtExport,
     ResolverManifest, SatisfiesResult, TreeDisplay, VERSION,
 };
 pub use manifest::Manifest;
-pub use multi_version_mode::MultiVersionMode;
 pub use options::{Flexibility, Options, OptionsBuilder};
 pub use preferences::{Preference, PreferenceError, Preferences};
 pub use prerelease::PrereleaseMode;
@@ -42,12 +42,12 @@ mod exclude_newer;
 mod exclusions;
 mod flat_index;
 mod fork_indexes;
+mod fork_strategy;
 mod fork_urls;
 mod graph_ops;
 mod lock;
 mod manifest;
 mod marker;
-mod multi_version_mode;
 mod options;
 mod pins;
 mod preferences;

crates/uv-resolver/src/lock/mod.rs

@@ -13,11 +13,11 @@ use std::sync::{Arc, LazyLock};
 use toml_edit::{value, Array, ArrayOfTables, InlineTable, Item, Table, Value};
 use url::Url;
 
+use crate::fork_strategy::ForkStrategy;
 pub use crate::lock::map::PackageMap;
 pub use crate::lock::requirements_txt::RequirementsTxtExport;
 pub use crate::lock::target::InstallTarget;
 pub use crate::lock::tree::TreeDisplay;
-use crate::multi_version_mode::MultiVersionMode;
 use crate::requires_python::SimplifiedMarkerTree;
 use crate::resolution::{AnnotatedDist, ResolutionGraphNode};
 use crate::universal_marker::{ConflictMarker, UniversalMarker};
@@ -240,7 +240,7 @@ impl Lock {
         let options = ResolverOptions {
             resolution_mode: resolution.options.resolution_mode,
             prerelease_mode: resolution.options.prerelease_mode,
-            multi_version_mode: resolution.options.multi_version_mode,
+            fork_strategy: resolution.options.fork_strategy,
             exclude_newer: resolution.options.exclude_newer,
         };
         let lock = Self::new(
@@ -551,8 +551,8 @@ impl Lock {
     }
 
     /// Returns the multi-version mode used to generate this lock.
-    pub fn multi_version_mode(&self) -> MultiVersionMode {
-        self.options.multi_version_mode
+    pub fn fork_strategy(&self) -> ForkStrategy {
+        self.options.fork_strategy
     }
 
     /// Returns the exclude newer setting used to generate this lock.
@@ -682,10 +682,10 @@ impl Lock {
                     value(self.options.prerelease_mode.to_string()),
                 );
             }
-            if self.options.multi_version_mode != MultiVersionMode::default() {
+            if self.options.fork_strategy != ForkStrategy::default() {
                 options_table.insert(
-                    "multi-version-mode",
-                    value(self.options.multi_version_mode.to_string()),
+                    "fork-strategy",
+                    value(self.options.fork_strategy.to_string()),
                 );
             }
             if let Some(exclude_newer) = self.options.exclude_newer {
@@ -1330,9 +1330,9 @@ struct ResolverOptions {
     /// The [`PrereleaseMode`] used to generate this lock.
     #[serde(default)]
     prerelease_mode: PrereleaseMode,
-    /// The [`MultiVersionMode`] used to generate this lock.
+    /// The [`ForkStrategy`] used to generate this lock.
     #[serde(default)]
-    multi_version_mode: MultiVersionMode,
+    fork_strategy: ForkStrategy,
     /// The [`ExcludeNewer`] used to generate this lock.
     exclude_newer: Option<ExcludeNewer>,
 }

crates/uv-resolver/src/lock/snapshots/uv_resolver__lock__tests__hash_optional_missing.snap

@@ -1,5 +1,5 @@
 ---
-source: crates/uv-resolver/src/lock/tests.rs
+source: crates/uv-resolver/src/lock/mod.rs
 expression: result
 ---
 Ok(
@@ -33,7 +33,7 @@ Ok(
         options: ResolverOptions {
             resolution_mode: Highest,
             prerelease_mode: IfNecessaryOrExplicit,
-            multi_version_mode: Fewest,
+            fork_strategy: RequiresPython,
             exclude_newer: None,
         },
         packages: [

crates/uv-resolver/src/lock/snapshots/uv_resolver__lock__tests__hash_optional_present.snap

@@ -1,5 +1,5 @@
 ---
-source: crates/uv-resolver/src/lock/tests.rs
+source: crates/uv-resolver/src/lock/mod.rs
 expression: result
 ---
 Ok(
@@ -33,7 +33,7 @@ Ok(
         options: ResolverOptions {
             resolution_mode: Highest,
             prerelease_mode: IfNecessaryOrExplicit,
-            multi_version_mode: Fewest,
+            fork_strategy: RequiresPython,
             exclude_newer: None,
         },
         packages: [

crates/uv-resolver/src/lock/snapshots/uv_resolver__lock__tests__hash_required_present.snap

@@ -1,5 +1,5 @@
 ---
-source: crates/uv-resolver/src/lock/tests.rs
+source: crates/uv-resolver/src/lock/mod.rs
 expression: result
 ---
 Ok(
@@ -33,7 +33,7 @@ Ok(
         options: ResolverOptions {
             resolution_mode: Highest,
             prerelease_mode: IfNecessaryOrExplicit,
-            multi_version_mode: Fewest,
+            fork_strategy: RequiresPython,
             exclude_newer: None,
         },
         packages: [

crates/uv-resolver/src/lock/snapshots/uv_resolver__lock__tests__missing_dependency_source_unambiguous.snap

@@ -33,7 +33,7 @@ Ok(
         options: ResolverOptions {
             resolution_mode: Highest,
             prerelease_mode: IfNecessaryOrExplicit,
-            multi_version_mode: Fewest,
+            fork_strategy: RequiresPython,
             exclude_newer: None,
         },
         packages: [

crates/uv-resolver/src/lock/snapshots/uv_resolver__lock__tests__missing_dependency_source_version_unambiguous.snap

@@ -33,7 +33,7 @@ Ok(
         options: ResolverOptions {
             resolution_mode: Highest,
             prerelease_mode: IfNecessaryOrExplicit,
-            multi_version_mode: Fewest,
+            fork_strategy: RequiresPython,
             exclude_newer: None,
         },
         packages: [