Merge pull request #10335 from gitbutlerapp/copilot/fix-0bb3fa6d-d622-42b8-a419-8514052670ca

Fix project title extraction for current directory in `but init`

Author: krlvi

crates/gitbutler-project/src/controller.rs

@@ -1,4 +1,4 @@
-use std::path::{Path, PathBuf};
+use std::path::{Component, Path, PathBuf};
 
 use anyhow::{anyhow, bail, Context, Result};
 use gitbutler_error::error;
@@ -101,18 +101,29 @@ impl Controller {
             }
         }
 
-        let id = uuid::Uuid::new_v4().to_string();
+        let id = ProjectId::generate();
 
-        // title is the base name of the file
-        let title = path
-            .iter()
+        // Resolve the path first to get the actual directory name
+        let resolved_path = gix::path::realpath(path)?;
+        let title_is_not_normal_component = path
+            .components()
             .next_back()
-            .map_or_else(|| id.clone(), |p| p.to_str().unwrap().to_string());
+            .is_none_or(|c| !matches!(c, Component::Normal(_)));
+        let path_for_title = if title_is_not_normal_component {
+            &resolved_path
+        } else {
+            path
+        };
+
+        let title = path_for_title.file_name().map_or_else(
+            || id.to_string(),
+            |name| name.to_string_lossy().into_owned(),
+        );
 
         let project = Project {
-            id: ProjectId::generate(),
+            id,
             title,
-            path: gix::path::realpath(path)?,
+            path: resolved_path,
             api: None,
             ..Default::default()
         };

crates/gitbutler-project/src/lib.rs

@@ -68,7 +68,10 @@ pub fn add<P: AsRef<Path>>(path: P) -> anyhow::Result<AddProjectOutcome> {
 }
 
 /// Testing purpose only.
-pub fn add_with_path<P: AsRef<Path>>(data_dir: P, path: P) -> anyhow::Result<AddProjectOutcome> {
+pub fn add_with_path(
+    data_dir: impl AsRef<Path>,
+    path: impl AsRef<Path>,
+) -> anyhow::Result<AddProjectOutcome> {
     let controller = Controller::from_path(data_dir.as_ref());
     controller.add(path)
 }

crates/gitbutler-project/tests/add_cwd_as_project.rs

@@ -0,0 +1,20 @@
+use gitbutler_testsupport::paths;
+
+#[test]
+fn current_directory_dot() -> anyhow::Result<()> {
+    let tmp = paths::data_dir();
+    let repository = gitbutler_testsupport::TestProject::default();
+    let repo_path = repository.path();
+
+    // Change to the repository directory and add "." as the path
+    std::env::set_current_dir(repo_path)?;
+
+    let project = gitbutler_project::add_with_path(tmp.path(), ".")?.unwrap_project();
+
+    let expected_title = repo_path.file_name().unwrap().to_str().unwrap();
+    assert_eq!(
+        project.title, expected_title,
+        "Project title should be the actual directory name, not '.'"
+    );
+    Ok(())
+}

crates/gitbutler-project/tests/projects/main.rs renamed to crates/gitbutler-project/tests/project/main.rs

@@ -49,7 +49,7 @@ mod add {
             let data_dir = paths::data_dir();
             let tmp = tempfile::tempdir().unwrap();
             let outcome =
-                gitbutler_project::add_with_path(data_dir.path(), &tmp.path().join("missing"))
+                gitbutler_project::add_with_path(data_dir.path(), tmp.path().join("missing"))
                     .unwrap();
             assert!(matches!(outcome, AddProjectOutcome::PathNotFound));
         }