From b17f4d68ef62fd5fa43df048c2368f901af767eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20K=C3=B6rber?= <hannes@hkoerber.de>
Date: Thu, 26 May 2022 16:30:37 +0200
Subject: [PATCH] Fix handling of unmanaged repositories

Before, there were warnings in case of nested trees.
---
 src/lib.rs | 37 ++++++++++++++++++++++++++++---------
 1 file changed, 28 insertions(+), 9 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index c6322f8..cd05ce5 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -272,13 +272,15 @@ fn sync_repo(root_path: &Path, repo: &Repo, init_worktree: bool) -> Result<(), S
 pub fn find_unmanaged_repos(
     root_path: &Path,
     managed_repos: &[Repo],
-) -> Result<Vec<String>, String> {
+) -> Result<Vec<PathBuf>, String> {
     let mut unmanaged_repos = Vec::new();
 
-    for repo in find_repo_paths(root_path)? {
-        let name = path_as_string(repo.strip_prefix(&root_path).unwrap());
-        if !managed_repos.iter().any(|r| r.name == name) {
-            unmanaged_repos.push(name);
+    for repo_path in find_repo_paths(root_path)? {
+        if !managed_repos
+            .iter()
+            .any(|r| Path::new(root_path).join(r.fullname()) == repo_path)
+        {
+            unmanaged_repos.push(repo_path);
         }
     }
     Ok(unmanaged_repos)
@@ -287,6 +289,9 @@ pub fn find_unmanaged_repos(
 pub fn sync_trees(config: Config, init_worktree: bool) -> Result<bool, String> {
     let mut failures = false;
 
+    let mut unmanaged_repos_absolute_paths = vec![];
+    let mut managed_repos_absolute_paths = vec![];
+
     let trees = config.trees()?;
 
     for tree in trees {
@@ -300,6 +305,7 @@ pub fn sync_trees(config: Config, init_worktree: bool) -> Result<bool, String> {
         let root_path = expand_path(Path::new(&tree.root));
 
         for repo in &repos {
+            managed_repos_absolute_paths.push(root_path.join(repo.fullname()));
             match sync_repo(&root_path, repo, init_worktree) {
                 Ok(_) => print_repo_success(&repo.name, "OK"),
                 Err(error) => {
@@ -310,10 +316,8 @@ pub fn sync_trees(config: Config, init_worktree: bool) -> Result<bool, String> {
         }
 
         match find_unmanaged_repos(&root_path, &repos) {
-            Ok(unmanaged_repos) => {
-                for name in unmanaged_repos {
-                    print_warning(&format!("Found unmanaged repository: {}", name));
-                }
+            Ok(repos) => {
+                unmanaged_repos_absolute_paths.extend(repos);
             }
             Err(error) => {
                 print_error(&format!("Error getting unmanaged repos: {}", error));
@@ -322,6 +326,21 @@ pub fn sync_trees(config: Config, init_worktree: bool) -> Result<bool, String> {
         }
     }
 
+    for unmanaged_repo_absolute_path in &unmanaged_repos_absolute_paths {
+        if managed_repos_absolute_paths
+            .iter()
+            .any(|managed_repo_absolute_path| {
+                managed_repo_absolute_path == unmanaged_repo_absolute_path
+            })
+        {
+            continue;
+        }
+        print_warning(&format!(
+            "Found unmanaged repository: \"{}\"",
+            path_as_string(unmanaged_repo_absolute_path)
+        ));
+    }
+
     Ok(!failures)
 }