fix: Move repo into folder when target path ends with slash (#264)

When new_path ends with / or \, treat it as a directory target and
move the repo into it (appending the repo's basename), matching
unix mv behaviour. E.g. 'move repo myrepo dst/' results in dst/myrepo.

The resolved destination path is now shown in the output message.

Prompts:
- repo move should move to folder when folder/ specified · Issue #264
- test for moving to existing folder?

Fixes #264

bump: minor

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: timabell

src/gitopolis.rs

@@ -354,10 +354,20 @@ impl Gitopolis {
 		Ok(folder_name)
 	}
 
-	pub fn move_repo(&mut self, old_path: &str, new_path: &str) -> Result<(), GitopolisError> {
+	pub fn move_repo(&mut self, old_path: &str, new_path: &str) -> Result<String, GitopolisError> {
 		let mut repos = self.load()?;
 		let normalized_old = normalize_folder(old_path.to_string());
-		let normalized_new = normalize_folder(new_path.to_string());
+		let is_dir_target = new_path.ends_with('/') || new_path.ends_with('\\');
+		let normalized_new = if is_dir_target {
+			let base = std::path::Path::new(&normalized_old)
+				.file_name()
+				.map(|f| f.to_string_lossy().to_string())
+				.unwrap_or_else(|| normalized_old.clone());
+			let dir = normalize_folder(new_path.to_string());
+			format!("{}/{}", dir, base)
+		} else {
+			normalize_folder(new_path.to_string())
+		};
 
 		// Find the repo in the config
 		let repo = repos
@@ -381,10 +391,10 @@ impl Gitopolis {
 
 		// Update the config: remove old entry and add new one with same tags/remotes
 		repos.remove(vec![normalized_old]);
-		repos.add_with_tags_and_remotes(normalized_new, repo.tags, repo.remotes);
+		repos.add_with_tags_and_remotes(normalized_new.clone(), repo.tags, repo.remotes);
 
 		self.save(repos)?;
-		Ok(())
+		Ok(normalized_new)
 	}
 
 	fn save(&self, repos: Repos) -> Result<(), GitopolisError> {

src/main.rs

@@ -261,8 +261,8 @@ fn main() {
 		Some(Commands::Move { entity }) => match entity {
 			MoveEntity::Repo { old_path, new_path } => {
 				match init_gitopolis().move_repo(old_path, new_path) {
-					Ok(_) => {
-						eprintln!("Moved {} to {}", old_path, new_path);
+					Ok(resolved_path) => {
+						eprintln!("Moved {} to {}", old_path, resolved_path);
 					}
 					Err(error) => {
 						eprintln!("Error: {}", error.message());

tests/end_to_end_tests.rs

@@ -2360,6 +2360,97 @@ url = \"git://example.org/test_url\"
 	assert_eq!(expected_toml, read_gitopolis_state_toml(&temp));
 }
 
+#[test]
+fn move_repo_into_folder() {
+	// When new_path ends with /, treat it as a directory and move repo into it
+	// Issue: https://github.com/timabell/gitopolis/issues/264
+	let temp = temp_folder();
+	add_a_repo(&temp, "my_repo", "git://example.org/test_url");
+
+	gitopolis_executable()
+		.current_dir(&temp)
+		.args(vec!["move", "repo", "my_repo", "dst/"])
+		.assert()
+		.success()
+		.stderr(predicate::str::contains("Moved my_repo to dst/my_repo"));
+
+	// Verify old location doesn't exist
+	assert!(!temp.path().join("my_repo").exists());
+
+	// Verify new location exists inside dst/
+	assert!(temp.path().join("dst/my_repo").exists());
+
+	// Verify config is updated
+	let expected_toml = "[[repos]]
+path = \"dst/my_repo\"
+tags = []
+
+[repos.remotes.origin]
+name = \"origin\"
+url = \"git://example.org/test_url\"
+";
+	assert_eq!(expected_toml, read_gitopolis_state_toml(&temp));
+}
+
+#[test]
+fn move_repo_into_folder_nested_source() {
+	// When source is nested and new_path ends with /, use only the final component
+	let temp = temp_folder();
+	add_a_repo(&temp, "services/auth", "git://example.org/test_url");
+
+	gitopolis_executable()
+		.current_dir(&temp)
+		.args(vec!["move", "repo", "services/auth", "apps/"])
+		.assert()
+		.success()
+		.stderr(predicate::str::contains("Moved services/auth to apps/auth"));
+
+	assert!(!temp.path().join("services/auth").exists());
+	assert!(temp.path().join("apps/auth").exists());
+
+	let expected_toml = "[[repos]]
+path = \"apps/auth\"
+tags = []
+
+[repos.remotes.origin]
+name = \"origin\"
+url = \"git://example.org/test_url\"
+";
+	assert_eq!(expected_toml, read_gitopolis_state_toml(&temp));
+}
+
+#[test]
+fn move_repo_into_existing_folder() {
+	// When destination folder already exists and path ends with /, move repo into it
+	let temp = temp_folder();
+	add_a_repo(&temp, "my_repo", "git://example.org/test_url");
+
+	// Create the destination folder ahead of time
+	std::fs::create_dir_all(temp.path().join("existing_dir")).unwrap();
+
+	gitopolis_executable()
+		.current_dir(&temp)
+		.args(vec!["move", "repo", "my_repo", "existing_dir/"])
+		.assert()
+		.success()
+		.stderr(predicate::str::contains(
+			"Moved my_repo to existing_dir/my_repo",
+		));
+
+	assert!(!temp.path().join("my_repo").exists());
+	assert!(temp.path().join("existing_dir/my_repo").exists());
+
+	let expected_toml = "[[repos]]
+path = \"existing_dir/my_repo\"
+tags = []
+
+[repos.remotes.origin]
+name = \"origin\"
+url = \"git://example.org/test_url\"
+";
+	assert_eq!(expected_toml, read_gitopolis_state_toml(&temp));
+}
+
 #[test]
 fn move_repo_not_found() {
 	// Test that move fails when repo doesn't exist