fix: windows path for the git client (kcl-lang#1377)

Signed-off-by: peefy <[email protected]>
Peefy · May 28, 2024 · e824bd6 · e824bd6
1 parent 67e8c28
commit e824bd6
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 8 deletions.
diff --git a/kclvm/driver/src/client/git.rs b/kclvm/driver/src/client/git.rs
@@ -4,6 +4,7 @@ use std::process::Command;
 
 use crate::client::fs::directory_is_not_empty;
 use anyhow::Result;
+use kclvm_utils::path::PathPrefix;
 
 pub(crate) fn cmd_clone_git_repo_to(
     url: &str,
@@ -15,34 +16,50 @@ pub(crate) fn cmd_clone_git_repo_to(
     if directory_is_not_empty(path) {
         return Ok(path.to_path_buf());
     }
+    let path = path.adjust_canonicalization();
     let mut git_clone_cmd = Command::new("git");
     git_clone_cmd.args(["clone", url]);
     if let Some(branch_name) = branch {
         git_clone_cmd.args(["--branch", branch_name]);
     }
-    git_clone_cmd.arg(path);
+    git_clone_cmd.arg(&path);
 
     let output = git_clone_cmd.output()?;
     if !output.status.success() {
-        bail!("Failed to clone Git repository {}", url);
+        bail!(
+            "Failed to clone Git repository {}: stdout: {} stderr: {}",
+            url,
+            String::from_utf8(output.stdout).unwrap(),
+            String::from_utf8(output.stderr).unwrap()
+        );
     }
     if let Some(tag_name) = tag {
         let output = Command::new("git")
             .args(["checkout", tag_name])
-            .current_dir(path)
+            .current_dir(&path)
             .output()?;
         if !output.status.success() {
-            bail!("Failed to checkout Git tag");
+            bail!(
+                "Failed to checkout Git tag {}: stdout: {} stderr: {}",
+                tag_name,
+                String::from_utf8(output.stdout).unwrap(),
+                String::from_utf8(output.stderr).unwrap()
+            );
         }
     } else if let Some(commit_hash) = commit {
         let output = Command::new("git")
             .args(["checkout", commit_hash])
-            .current_dir(path)
+            .current_dir(&path)
             .output()?;
         if !output.status.success() {
-            bail!("Failed to checkout Git commit");
+            bail!(
+                "Failed to checkout Git commit {}: stdout: {} stderr: {}",
+                commit_hash,
+                String::from_utf8(output.stdout).unwrap(),
+                String::from_utf8(output.stderr).unwrap()
+            )
         }
     }
 
-    Ok(path.to_path_buf())
+    Ok(path.into())
 }
diff --git a/kclvm/utils/src/path.rs b/kclvm/utils/src/path.rs
@@ -70,7 +70,7 @@ where
     }
 }
 
-/// Conver windows drive letter to upcase
+/// Convert windows drive letter to upcase
 pub fn convert_windows_drive_letter(path: &str) -> String {
     #[cfg(target_os = "windows")]
     {