Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Add create flag to WorktreePathExists error
Maximilian Roos14310f955616
diff --git a/src/commands/worktree.rs b/src/commands/worktree.rsindex 0288829bb..de0e3aa7f 100644--- a/src/commands/worktree.rs+++ b/src/commands/worktree.rs@@ -621,6 +621,7 @@ pub fn handle_switch(return Err(GitError::WorktreePathExists {branch: resolved_branch.clone(),path: worktree_path,+ create,}.into());}@@ -669,6 +670,7 @@ pub fn handle_switch(return Err(GitError::WorktreePathExists {branch: resolved_branch.clone(),path: std::path::PathBuf::from(path_str),+ create,}.into());}diff --git a/src/git/error.rs b/src/git/error.rsindex b4be990bf..7d32997c0 100644--- a/src/git/error.rs+++ b/src/git/error.rs@@ -76,6 +76,7 @@ pub enum GitError {WorktreePathExists {branch: String,path: PathBuf,+ create: bool,},WorktreeCreationFailed {branch: String,@@ -255,11 +256,20 @@ impl std::fmt::Display for GitError {)}- GitError::WorktreePathExists { branch, path } => {+ GitError::WorktreePathExists {+ branch,+ path,+ create,+ } => {let path_display = format_path_for_display(path);let path_str = path.to_string_lossy();let path_escaped = escape(Cow::Borrowed(path_str.as_ref()));- let switch_cmd = suggest_command("switch", &[branch], &["--clobber"]);+ let flags: &[&str] = if *create {+ &["--create", "--clobber"]+ } else {+ &["--clobber"]+ };+ let switch_cmd = suggest_command("switch", &[branch], flags);write!(f,"{}\n\n{}",@@ -710,6 +720,7 @@ mod tests {let err = GitError::WorktreePathExists {branch: "feature".to_string(),path: PathBuf::from("/some/path"),+ create: false,};assert_snapshot!(err.to_string(), @"[31m✗[39m [31mDirectory already exists: [1m/some/path[22m[39m@@ -718,6 +729,20 @@ mod tests {");}+ #[test]+ fn snapshot_worktree_error_with_path_and_create() {+ let err = GitError::WorktreePathExists {+ branch: "feature".to_string(),+ path: PathBuf::from("/some/path"),+ create: true,+ };+ assert_snapshot!(err.to_string(), @"+ [31m✗[39m [31mDirectory already exists: [1m/some/path[22m[39m++ [2m↳[22m [2mTo remove manually, run [90mrm -rf /some/path[39m; to overwrite (with backup), run [90mwt switch feature --create --clobber[39m[22m+ ");+ }+#[test]fn test_exit_code() {// ChildProcessExiteddiff --git a/tests/integration_tests/git_error_display.rs b/tests/integration_tests/git_error_display.rsindex 5087c942e..8f7c25aea 100644--- a/tests/integration_tests/git_error_display.rs+++ b/tests/integration_tests/git_error_display.rs@@ -62,6 +62,7 @@ fn display_worktree_path_exists() {let err = GitError::WorktreePathExists {branch: "feature".to_string(),path: PathBuf::from("/tmp/repo.feature"),+ create: false,};assert_snapshot!("worktree_path_exists", err.to_string());diff --git a/tests/snapshots/integration__integration_tests__switch__switch_error_path_occupied.snap b/tests/snapshots/integration__integration_tests__switch__switch_error_path_occupied.snapindex 19b099ac4..5af84e08d 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_error_path_occupied.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_error_path_occupied.snap@@ -33,4 +33,4 @@ exit_code: 1----- stderr -----[31m✗[39m [31mDirectory already exists: [1m_REPO_.occupied-branch[22m[39m-[2m↳[22m [2mTo remove manually, run [90mrm -rf _REPO_.occupied-branch[39m; to overwrite (with backup), run [90mwt switch occupied-branch --clobber[39m[22m+[2m↳[22m [2mTo remove manually, run [90mrm -rf _REPO_.occupied-branch[39m; to overwrite (with backup), run [90mwt switch occupied-branch --create --clobber[39m[22m