Elgato_dark/gitui
1
0
Fork 0
mirror of https://github.com/gitui-org/gitui synced 2026-05-23 08:58:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix 1102 performance reg (#1103)

Browse source
This commit is contained in:
Stephan Dilly 2022-01-26 00:30:19 +01:00 committed by GitHub
parent acb7e52696
commit 6cf39a88f5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.md
View file

@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## Unreleased
### Fixed
* severe performance regression ([#1102](https://github.com/extrawurst/gitui/1102))
* windows release deployment via CD broken
## [0.20] - 2021-01-25 - Tag Annotations
**support tag annotations**

25
src/tabs/status.rs
View file

@ -15,8 +15,7 @@ use anyhow::Result;
use asyncgit::{
cached,
sync::{
self, get_branches_info, status::StatusType, RepoPath,
RepoPathRef, RepoState,
self, status::StatusType, RepoPath, RepoPathRef, RepoState,
},
sync::{BranchCompare, CommitId},
AsyncDiff, AsyncGitNotification, AsyncStatus, DiffParams,
@ -67,6 +66,7 @@ pub struct Status {
index_wd: ChangesComponent,
diff: DiffComponent,
git_diff: AsyncDiff,
has_remotes: bool,
git_status_workdir: AsyncStatus,
git_status_stage: AsyncStatus,
git_branch_state: Option<BranchCompare>,
@ -161,6 +161,7 @@ impl Status {
Self {
queue: queue.clone(),
visible: true,
has_remotes: false,
focus: Focus::WorkDir,
diff_target: DiffTarget::WorkingDir,
index_wd: ChangesComponent::new(
@ -422,6 +423,13 @@ impl Status {
|| self.git_status_workdir.is_pending()
}
fn check_remotes(&mut self) {
self.has_remotes =
sync::get_branches_info(&self.repo.borrow(), false)
.map(|branches| !branches.is_empty())
.unwrap_or(false);
}
///
pub fn update_git(
&mut self,
@ -568,12 +576,6 @@ impl Status {
}
}
fn has_remotes(&self) -> bool {
get_branches_info(&self.repo.borrow(), false)
.map(|l| !l.is_empty())
.unwrap_or(false)
}
fn pull(&self) {
if let Some(branch) = self.git_branch_name.last() {
self.queue.push(InternalEvent::Pull(branch));
@ -603,11 +605,11 @@ impl Status {
self.git_branch_state
.as_ref()
.map_or(true, |state| state.ahead > 0)
&& self.has_remotes()
&& self.has_remotes
}
fn can_pull(&self) -> bool {
self.has_remotes() && self.git_branch_state.is_some()
const fn can_pull(&self) -> bool {
self.has_remotes && self.git_branch_state.is_some()
}
fn can_abort_merge(&self) -> bool {
@ -937,6 +939,7 @@ impl Component for Status {
fn show(&mut self) -> Result<()> {
self.visible = true;
self.check_remotes();
self.update()?;
Ok(())