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

Properly report status on worktree repos

Browse Source
This commit is contained in:
Hannes Körber
2022-01-04 12:22:02 +01:00
parent f9d9dc587a
commit 31b90af066
2 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/repo.rs
View File

@@ -790,11 +790,7 @@ impl Repo {
};
let changes = match is_worktree {
true => {
return Err(String::from(
"Cannot get changes as this is a bare worktree repository",
))
}
true => None,
false => {
let statuses = self
.0

31
src/table.rs
View File

@@ -30,21 +30,24 @@ fn add_repo_status(
true => "\u{2714}",
false => "",
},
&match repo_status.changes {
Some(changes) => {
let mut out = Vec::new();
if changes.files_new > 0 {
out.push(format!("New: {}\n", changes.files_new))
&match is_worktree {
true => String::from(""),
false => match repo_status.changes {
Some(changes) => {
let mut out = Vec::new();
if changes.files_new > 0 {
out.push(format!("New: {}\n", changes.files_new))
}
if changes.files_modified > 0 {
out.push(format!("Modified: {}\n", changes.files_modified))
}
if changes.files_deleted > 0 {
out.push(format!("Deleted: {}\n", changes.files_deleted))
}
out.into_iter().collect::<String>().trim().to_string()
}
if changes.files_modified > 0 {
out.push(format!("Modified: {}\n", changes.files_modified))
}
if changes.files_deleted > 0 {
out.push(format!("Deleted: {}\n", changes.files_deleted))
}
out.into_iter().collect::<String>().trim().to_string()
}
None => String::from("\u{2714}"),
None => String::from("\u{2714}"),
},
},
repo_status
.branches