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

fix naming

Browse source
This commit is contained in:
Stephan Dilly 2020-05-22 17:43:15 +02:00
parent 3bd01b324d
commit 9e1db3d448
2 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/stashmsg.rs
View file

@ -57,7 +57,7 @@ impl Component for StashMsgComponent {
Some(self.input.get_text().as_str())
},
self.options.stash_untracked,
!self.options.stash_indexed,
self.options.keep_index,
)
.is_ok()
{

20
src/tabs/stashing.rs
View file

@ -26,7 +26,7 @@ use tui::{
#[derive(Default, Clone, Copy)]
pub struct StashingOptions {
pub stash_untracked: bool,
pub stash_indexed: bool,
pub keep_index: bool,
}
pub struct Stashing {
@ -56,7 +56,7 @@ impl Stashing {
),
visible: false,
options: StashingOptions {
stash_indexed: true,
keep_index: false,
stash_untracked: true,
},
theme: *theme,
@ -67,15 +67,9 @@ impl Stashing {
///
pub fn update(&mut self) {
let status_type = if self.options.stash_indexed {
StatusType::Both
} else {
StatusType::WorkingDir
};
self.git_status
.fetch(StatusParams::new(
status_type,
StatusType::Both,
self.options.stash_untracked,
))
.unwrap();
@ -115,13 +109,13 @@ impl Stashing {
bracket_close.clone(),
Text::Raw(Cow::from(" stash untracked\n")),
bracket_open,
if self.options.stash_indexed {
if self.options.keep_index {
option_on.clone()
} else {
option_off.clone()
},
bracket_close,
Text::Raw(Cow::from(" stash staged")),
Text::Raw(Cow::from(" keep index")),
]
}
}
@ -206,8 +200,8 @@ impl Component for Stashing {
true
}
keys::STASHING_TOGGLE_INDEX => {
self.options.stash_indexed =
!self.options.stash_indexed;
self.options.keep_index =
!self.options.keep_index;
self.update();
true
}