Skip to content

Fix 586 deadlock pull creds #587

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
extrawurst merged 5 commits into from
Mar 13, 2021
Merged

Fix 586 deadlock pull creds #587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
564f807
fix deadlock when closing credentials input without completing
Mar 13, 2021
d780045
changelog
Mar 13, 2021
d16a083
testtest
Mar 13, 2021
dc722a6
fix same deadlock in push/push-tags
Mar 13, 2021
5b56c96
cleanup
Mar 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Fixed
- keep diff line selection after staging/unstaging/discarding ([#583](https://github.com/extrawurst/gitui/issues/583))
- fix pull deadlocking when aborting credentials input ([#586](https://github.com/extrawurst/gitui/issues/586))

## [0.12.0] - 2020-03-03

Expand Down
3 changes: 3 additions & 0 deletions src/components/cred.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,9 @@ impl Component for CredComponent {
if let Event::Key(e) = ev {
if e == self.key_config.exit_popup {
self.hide();
return Ok(true);
}

if self.input_username.event(ev)?
|| self.input_password.event(ev)?
{
Expand Down Expand Up @@ -139,6 +141,7 @@ impl Component for CredComponent {
}
}
}

return Ok(true);
}
Ok(false)
Expand Down
7 changes: 4 additions & 3 deletions src/components/pull.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,9 +257,10 @@ impl Component for PullComponent {
if self.visible {
if let Event::Key(_) = ev {
if self.input_cred.is_visible() {
if self.input_cred.event(ev)? {
return Ok(true);
} else if self.input_cred.get_cred().is_complete()
self.input_cred.event(ev)?;

if self.input_cred.get_cred().is_complete()
|| !self.input_cred.is_visible()
{
self.fetch_from_remote(Some(
self.input_cred.get_cred().clone(),
Expand Down
7 changes: 4 additions & 3 deletions src/components/push.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,9 +253,10 @@ impl Component for PushComponent {
if self.visible {
if let Event::Key(e) = ev {
if self.input_cred.is_visible() {
if self.input_cred.event(ev)? {
return Ok(true);
} else if self.input_cred.get_cred().is_complete()
self.input_cred.event(ev)?;

if self.input_cred.get_cred().is_complete()
|| !self.input_cred.is_visible()
{
self.push_to_remote(
Some(self.input_cred.get_cred().clone()),
Expand Down
7 changes: 4 additions & 3 deletions src/components/push_tags.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,9 +227,10 @@ impl Component for PushTagsComponent {
if self.visible {
if let Event::Key(e) = ev {
if self.input_cred.is_visible() {
if self.input_cred.event(ev)? {
return Ok(true);
} else if self.input_cred.get_cred().is_complete()
self.input_cred.event(ev)?;

if self.input_cred.get_cred().is_complete()
|| !self.input_cred.is_visible()
{
self.push_to_remote(Some(
self.input_cred.get_cred().clone(),
Expand Down