Llewellyn/starship
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/starship.git synced 2025-01-27 17:18:37 +00:00
Code Issues Releases Activity

perf(git_status): Improved git_status module performance (#1777)

Browse Source
This commit is contained in:
SarthakSingh31 2020-10-14 09:12:41 -07:00 committed by GitHub
parent 2582b7e6c2
commit a73d7140eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/modules/git_status.rs
View File

@ -152,9 +152,9 @@ impl<'a> GitStatusInfo<'a> {
} }
{ {
let mut data = self.ahead_behind.write().unwrap();
let repo = self.get_repository()?; let repo = self.get_repository()?;
let branch_name = self.get_branch_name(); let branch_name = self.get_branch_name();
let mut data = self.ahead_behind.write().unwrap();
*data = Some(get_ahead_behind(&repo, &branch_name)); *data = Some(get_ahead_behind(&repo, &branch_name));
match data.as_ref().unwrap() { match data.as_ref().unwrap() {
Ok(ahead_behind) => Some(*ahead_behind), Ok(ahead_behind) => Some(*ahead_behind),
@ -181,8 +181,8 @@ impl<'a> GitStatusInfo<'a> {
} }
{ {
let mut repo = self.get_repository()?;
let mut data = self.repo_status.write().unwrap(); let mut data = self.repo_status.write().unwrap();
let mut repo = self.get_repository()?;
*data = Some(get_repo_status(&mut repo)); *data = Some(get_repo_status(&mut repo));
match data.as_ref().unwrap() { match data.as_ref().unwrap() {
Ok(repo_status) => Some(*repo_status), Ok(repo_status) => Some(*repo_status),
@ -209,8 +209,8 @@ impl<'a> GitStatusInfo<'a> {
} }
{ {
let mut repo = self.get_repository()?;
let mut data = self.stashed_count.write().unwrap(); let mut data = self.stashed_count.write().unwrap();
let mut repo = self.get_repository()?;
*data = Some(get_stashed_count(&mut repo)); *data = Some(get_stashed_count(&mut repo));
match data.as_ref().unwrap() { match data.as_ref().unwrap() {
Ok(stashed_count) => Some(*stashed_count), Ok(stashed_count) => Some(*stashed_count),
@ -249,6 +249,7 @@ impl<'a> GitStatusInfo<'a> {
/// Gets the number of files in various git states (staged, modified, deleted, etc...) /// Gets the number of files in various git states (staged, modified, deleted, etc...)
fn get_repo_status(repository: &mut Repository) -> Result<RepoStatus, git2::Error> { fn get_repo_status(repository: &mut Repository) -> Result<RepoStatus, git2::Error> {
log::debug!("New repo status created");
let mut status_options = git2::StatusOptions::new(); let mut status_options = git2::StatusOptions::new();
let mut repo_status = RepoStatus::default(); let mut repo_status = RepoStatus::default();