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 1104 performance regression (#1107)

Browse source
This commit is contained in:
Stephan Dilly 2022-01-26 09:56:17 +01:00 committed by GitHub
parent 53e855e488
commit fce9b90071
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/app.rs
View file

@ -610,7 +610,9 @@ impl App {
}
fn update_commands(&mut self) {
self.help.set_cmds(self.commands(true));
if self.help.is_visible() {
self.help.set_cmds(self.commands(true));
}
self.cmdbar.borrow_mut().set_cmds(self.commands(false));
}

66
src/tabs/status.rs
View file

@ -67,6 +67,7 @@ pub struct Status {
diff: DiffComponent,
git_diff: AsyncDiff,
has_remotes: bool,
git_state: RepoState,
git_status_workdir: AsyncStatus,
git_status_stage: AsyncStatus,
git_branch_state: Option<BranchCompare>,
@ -162,6 +163,7 @@ impl Status {
queue: queue.clone(),
visible: true,
has_remotes: false,
git_state: RepoState::Clean,
focus: Focus::WorkDir,
diff_target: DiffTarget::WorkingDir,
index_wd: ChangesComponent::new(
@ -296,38 +298,34 @@ impl Status {
f: &mut tui::Frame<B>,
r: tui::layout::Rect,
) {
if let Ok(state) = sync::repo_state(&self.repo.borrow()) {
if state != RepoState::Clean {
let txt = Self::repo_state_text(
&self.repo.borrow(),
&state,
);
if self.git_state != RepoState::Clean {
let txt = Self::repo_state_text(
&self.repo.borrow(),
&self.git_state,
);
let w = Paragraph::new(txt)
.block(
Block::default()
.border_type(BorderType::Plain)
.borders(Borders::all())
.border_style(
Style::default().fg(Color::Yellow),
)
.title(format!("Pending {:?}", state)),
)
.style(Style::default().fg(Color::Red))
.alignment(Alignment::Left);
let w = Paragraph::new(txt)
.block(
Block::default()
.border_type(BorderType::Plain)
.borders(Borders::all())
.border_style(
Style::default().fg(Color::Yellow),
)
.title(format!(
"Pending {:?}",
self.git_state
)),
)
.style(Style::default().fg(Color::Red))
.alignment(Alignment::Left);
f.render_widget(w, r);
}
f.render_widget(w, r);
}
}
fn repo_state_unclean(&self) -> bool {
if let Ok(state) = sync::repo_state(&self.repo.borrow()) {
if state != RepoState::Clean {
return true;
}
}
false
self.git_state != RepoState::Clean
}
fn can_focus_diff(&self) -> bool {
@ -410,6 +408,9 @@ impl Status {
config,
))?;
self.git_state = sync::repo_state(&self.repo.borrow())
.unwrap_or(RepoState::Clean);
self.branch_compare();
}
@ -457,6 +458,7 @@ impl Status {
self.index_wd.set_items(&workdir_status.items)?;
self.update_diff()?;
self.check_remotes();
if self.git_action_executed {
self.git_action_executed = false;
@ -613,21 +615,15 @@ impl Status {
}
fn can_abort_merge(&self) -> bool {
sync::repo_state(&self.repo.borrow())
.unwrap_or(RepoState::Clean)
== RepoState::Merge
self.git_state == RepoState::Merge
}
fn pending_rebase(&self) -> bool {
sync::repo_state(&self.repo.borrow())
.unwrap_or(RepoState::Clean)
== RepoState::Rebase
self.git_state == RepoState::Rebase
}
fn pending_revert(&self) -> bool {
sync::repo_state(&self.repo.borrow())
.unwrap_or(RepoState::Clean)
== RepoState::Revert
self.git_state == RepoState::Revert
}
pub fn revert_pending_state(&self) {