fix: bugs with mise up and prefix: versions

e2e/cli/test_upgrade

@@ -24,3 +24,26 @@ bazelbuild_latest=$(mise latest ubi:bazelbuild/buildtools)
 mise up --bump ubi:bazelbuild/buildtools
 assert "cat mise.toml" "[tools]
 \"ubi:bazelbuild/buildtools\" = { version = \"$bazelbuild_latest\", exe = \"buildifier\", matching = \"buildifier\" }"
+
+rm -f .tool-versions
+echo "tools.dummy = 'prefix:1'" >mise.toml
+mise uninstall dummy --all
+mkdir -p "$MISE_DATA_DIR/installs/dummy/1.0.0"
+assert "mise ls dummy" "dummy  1.0.0 (outdated)  ~/workdir/mise.toml prefix:1"
+assert "mise up -n" "Would uninstall [email protected]
+Would install [email protected]"
+mise up
+assert "mise ls dummy" "dummy  1.1.0  ~/workdir/mise.toml prefix:1"
+assert "mise up dummy -n --bump" "Would uninstall [email protected]
+Would install [email protected]
+Would bump dummy@prefix:2 in ~/workdir/mise.toml"
+mise up dummy --bump
+assert "mise ls dummy" "dummy  2.0.0  ~/workdir/mise.toml prefix:2"
+echo "tools.dummy = 'prefix:1'" >mise.toml
+mise uninstall dummy --all
+mise i [email protected]
+assert "mise up dummy -n --bump" "Would uninstall [email protected]
+Would install [email protected]
+Would bump dummy@prefix:2 in ~/workdir/mise.toml"
+mise up dummy --bump
+assert "mise ls dummy" "dummy  2.0.0  ~/workdir/mise.toml prefix:2"

e2e/cli/test_use

@@ -64,3 +64,11 @@ mise use -g gh@2
 assert "cat ~/.config/mise/config.toml" '[tools]
 gh = "2"'
 rm -f ~/.config/mise/config.toml
+
+mise uninstall dummy --all
+mise use dummy@system
+assert "mise ls dummy" "dummy  system  ~/workdir/mise.toml system"
+
+mkdir -p ~/workdir/mydummy
+mise use "dummy@path:~/workdir/mydummy"
+assert_contains "mise ls dummy" "dummy  path:~/workdir/mydummy  ~/workdir/mise.toml path:~/workdir/mydummy"

e2e/tasks/test_task_deps

@@ -2,12 +2,13 @@
 
 cat <<EOF >mise.toml
 tasks.a.run = "echo a"
+tasks.b.depends = ["a"]
 tasks.b.run = "echo b"
-tasks.c.run = "echo c"
 tasks.c.depends = ["a"]
-tasks.b.depends = ["a"]
-tasks.d.run = "echo d"
+tasks.c.run = "echo c"
+tasks.c.wait_for = ["b"]
 tasks.d.depends = ["c"]
+tasks.d.run = "echo d"
 tasks.d.wait_for = ["b"]
 EOF
 

src/backend/mod.rs

@@ -235,16 +235,26 @@ pub trait Backend: Debug + Send + Sync {
         install_state::list_versions(&self.ba().short)
     }
     fn is_version_installed(&self, tv: &ToolVersion, check_symlink: bool) -> bool {
+        let check_path = |install_path: &Path| {
+            let is_installed = install_path.exists();
+            let is_not_incomplete = !self.incomplete_file_path(tv).exists();
+            let is_valid_symlink = !check_symlink || !is_runtime_symlink(install_path);
+
+            is_installed && is_not_incomplete && is_valid_symlink
+        };
         match tv.request {
             ToolRequest::System { .. } => true,
+            ToolRequest::Prefix { .. } => {
+                // can't use tv.request.install_path() in this case since it may point to a version
+                // that matches the prefix but is not the correct one. For example, in the following
+                // scenario this would not upgrade tiny because "prefix:1" would still match and
+                // `mise up` would think it is installed
+                //     mise install [email protected]
+                //     mise use tiny@prefix:1
+                //     mise up tiny
+                check_path(&tv.install_path())
+            }
             _ => {
-                let check_path = |install_path: &Path| {
-                    let is_installed = install_path.exists();
-                    let is_not_incomplete = !self.incomplete_file_path(tv).exists();
-                    let is_valid_symlink = !check_symlink || !is_runtime_symlink(install_path);
-
-                    is_installed && is_not_incomplete && is_valid_symlink
-                };
                 if let Some(install_path) = tv.request.install_path() {
                     if check_path(&install_path) {
                         return true;

src/cli/snapshots/mise__cli__upgrade__tests__upgrade.snap

@@ -3,5 +3,5 @@ source: src/cli/upgrade.rs
 expression: output
 snapshot_kind: text
 ---
-mise Would uninstall tiny@3.0.0
-mise Would install tiny@3.1.0
+Would uninstall tiny@3.0.0
+Would install tiny@3.1.0

src/cli/snapshots/mise__cli__upgrade__tests__upgrade_bump.snap

@@ -3,7 +3,7 @@ source: src/cli/upgrade.rs
 expression: output
 snapshot_kind: text
 ---
-mise Would uninstall tiny@3.0.0
-mise Would uninstall dummy@ref:master
-mise Would install tiny@3.1.0
-mise Would install dummy@2.0.0
+Would uninstall tiny@3.0.0
+Would uninstall dummy@ref:master
+Would install tiny@3.1.0
+Would install dummy@2.0.0

src/cli/upgrade.rs

@@ -88,9 +88,9 @@ impl Upgrade {
         let config_file_updates = outdated
             .iter()
             .filter_map(|o| {
-                if let (Some(path), Some(bump)) = (o.source.path(), &o.bump) {
+                if let (Some(path), Some(_bump)) = (o.source.path(), &o.bump) {
                     match config_file::parse(path) {
-                        Ok(cf) => Some((o, bump.clone(), cf)),
+                        Ok(cf) => Some((o, cf)),
                         Err(e) => {
                             warn!("failed to parse {}: {e}", display_path(path));
                             None
@@ -100,7 +100,7 @@ impl Upgrade {
                     None
                 }
             })
-            .filter(|(o, _bump, cf)| {
+            .filter(|(o, cf)| {
                 if let Ok(trs) = cf.to_tool_request_set() {
                     if let Some(versions) = trs.tools.get(o.tool_request.ba()) {
                         if versions.len() != 1 {
@@ -120,16 +120,16 @@ impl Upgrade {
 
         if self.dry_run {
             for (o, current) in &to_remove {
-                info!("Would uninstall {}@{}", o.name, current);
+                miseprintln!("Would uninstall {}@{}", o.name, current);
             }
             for o in &outdated {
-                info!("Would install {}@{}", o.name, o.latest);
+                miseprintln!("Would install {}@{}", o.name, o.latest);
             }
-            for (o, bump, cf) in &config_file_updates {
-                info!(
+            for (o, cf) in &config_file_updates {
+                miseprintln!(
                     "Would bump {}@{} in {}",
                     o.name,
-                    bump,
+                    o.tool_request.version(),
                     display_path(cf.get_path())
                 );
             }
@@ -147,8 +147,8 @@ impl Upgrade {
         let new_versions = outdated.iter().map(|o| o.tool_request.clone()).collect();
         let versions = ts.install_versions(config, new_versions, &mpr, &opts)?;
 
-        for (o, bump, mut cf) in config_file_updates {
-            cf.replace_versions(o.tool_request.ba(), &[(bump, o.tool_request.options())])?;
+        for (o, mut cf) in config_file_updates {
+            cf.replace_versions(o.tool_request.ba(), vec![o.tool_request.clone()])?;
             cf.save()?;
         }
 

src/cli/use.rs

@@ -117,18 +117,33 @@ impl Use {
         let mut cf = self.get_config_file()?;
         let pin = self.pin || !self.fuzzy && (SETTINGS.pin || SETTINGS.asdf_compat);
 
-        for (fa, tvl) in &versions.iter().chunk_by(|tv| tv.ba()) {
+        for (ba, tvl) in &versions.iter().chunk_by(|tv| tv.ba()) {
             let versions: Vec<_> = tvl
                 .into_iter()
                 .map(|tv| {
+                    let mut request = tv.request.clone();
                     if pin {
-                        (tv.version.clone(), tv.request.options())
-                    } else {
-                        (tv.request.version(), tv.request.options())
+                        if let ToolRequest::Version {
+                            version: _version,
+                            source,
+                            os,
+                            options,
+                            backend,
+                        } = request
+                        {
+                            request = ToolRequest::Version {
+                                version: tv.version.clone(),
+                                source,
+                                os,
+                                options,
+                                backend,
+                            };
+                        }
                     }
+                    request
                 })
                 .collect();
-            cf.replace_versions(fa, &versions)?;
+            cf.replace_versions(ba, versions)?;
         }
 
         if self.global {

src/config/config_file/legacy_version.rs

@@ -5,7 +5,7 @@ use eyre::Result;
 use crate::backend::{self, BackendList};
 use crate::cli::args::BackendArg;
 use crate::config::config_file::ConfigFile;
-use crate::toolset::{ToolRequest, ToolRequestSet, ToolSource, ToolVersionOptions};
+use crate::toolset::{ToolRequest, ToolRequestSet, ToolSource};
 
 #[derive(Debug, Clone)]
 pub struct LegacyVersionFile {
@@ -55,22 +55,26 @@ impl ConfigFile for LegacyVersionFile {
         self.path.as_path()
     }
 
+    #[cfg_attr(coverage_nightly, coverage(off))]
     fn remove_plugin(&mut self, _fa: &BackendArg) -> Result<()> {
         unimplemented!()
     }
 
+    #[cfg_attr(coverage_nightly, coverage(off))]
     fn replace_versions(
         &mut self,
         _plugin_name: &BackendArg,
-        _versions: &[(String, ToolVersionOptions)],
+        _versions: Vec<ToolRequest>,
     ) -> Result<()> {
         unimplemented!()
     }
 
+    #[cfg_attr(coverage_nightly, coverage(off))]
     fn save(&self) -> Result<()> {
         unimplemented!()
     }
 
+    #[cfg_attr(coverage_nightly, coverage(off))]
     fn dump(&self) -> Result<String> {
         unimplemented!()
     }