hannes/git-repo-manager
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix handling of unmanaged repositories

Browse Source 
Before, there were warnings in case of nested trees.
This commit is contained in:
Hannes Körber
2022-05-26 16:30:37 +02:00
parent b8c552fb62
commit b17f4d68ef
1 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/lib.rs
View File

@@ -272,13 +272,15 @@ fn sync_repo(root_path: &Path, repo: &Repo, init_worktree: bool) -> Result<(), S
pub fn find_unmanaged_repos( pub fn find_unmanaged_repos(
root_path: &Path, root_path: &Path,
managed_repos: &[Repo], managed_repos: &[Repo],
) -> Result<Vec<String>, String> { ) -> Result<Vec<PathBuf>, String> {
let mut unmanaged_repos = Vec::new(); let mut unmanaged_repos = Vec::new();
for repo in find_repo_paths(root_path)? { for repo_path in find_repo_paths(root_path)? {
let name = path_as_string(repo.strip_prefix(&root_path).unwrap()); if !managed_repos
if !managed_repos.iter().any(|r| r.name == name) { .iter()
unmanaged_repos.push(name); .any(|r| Path::new(root_path).join(r.fullname()) == repo_path)
{
unmanaged_repos.push(repo_path);
} }
} }
Ok(unmanaged_repos) Ok(unmanaged_repos)
@@ -287,6 +289,9 @@ pub fn find_unmanaged_repos(
pub fn sync_trees(config: Config, init_worktree: bool) -> Result<bool, String> { pub fn sync_trees(config: Config, init_worktree: bool) -> Result<bool, String> {
let mut failures = false; let mut failures = false;
let mut unmanaged_repos_absolute_paths = vec![];
let mut managed_repos_absolute_paths = vec![];
let trees = config.trees()?; let trees = config.trees()?;
for tree in 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)); let root_path = expand_path(Path::new(&tree.root));
for repo in &repos { for repo in &repos {
managed_repos_absolute_paths.push(root_path.join(repo.fullname()));
match sync_repo(&root_path, repo, init_worktree) { match sync_repo(&root_path, repo, init_worktree) {
Ok(_) => print_repo_success(&repo.name, "OK"), Ok(_) => print_repo_success(&repo.name, "OK"),
Err(error) => { 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) { match find_unmanaged_repos(&root_path, &repos) {
Ok(unmanaged_repos) => { Ok(repos) => {
for name in unmanaged_repos { unmanaged_repos_absolute_paths.extend(repos);
print_warning(&format!("Found unmanaged repository: {}", name));
}
} }
Err(error) => { Err(error) => {
print_error(&format!("Error getting unmanaged repos: {}", 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) Ok(!failures)
} }