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

add error handling on potential error in ignore (#191)

Browse source
This commit is contained in:
Stephan Dilly 2020-07-10 09:08:36 +02:00
parent fc142b4604
commit cbd75110b7
2 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
asyncgit/src/sync/ignore.rs
View file

@ -8,7 +8,7 @@ static GITIGNORE: &str = ".gitignore";
/// add file or path to root ignore file
pub fn add_to_ignore(
repo_path: &str,
path_to_ignore: String,
path_to_ignore: &str,
) -> Result<()> {
scope_time!("add_to_ignore");

28
src/components/changes.rs
View file

@ -172,15 +172,27 @@ impl ChangesComponent {
false
}
fn add_to_ignore(&mut self) -> Result<bool> {
fn add_to_ignore(&mut self) -> bool {
if let Some(tree_item) = self.selection() {
sync::add_to_ignore(CWD, tree_item.info.full_path)?;
self.queue
.borrow_mut()
.push_back(InternalEvent::Update(NeedsUpdate::ALL));
return Ok(true);
if let Err(e) =
sync::add_to_ignore(CWD, &tree_item.info.full_path)
{
self.queue.borrow_mut().push_back(
InternalEvent::ShowErrorMsg(format!(
"ignore error:\n{}\nfile:\n{:?}",
e, tree_item.info.full_path
)),
);
} else {
self.queue.borrow_mut().push_back(
InternalEvent::Update(NeedsUpdate::ALL),
);
return true;
}
}
Ok(false)
false
}
}
@ -306,7 +318,7 @@ impl Component for ChangesComponent {
if self.is_working_dir
&& !self.is_empty() =>
{
Ok(self.add_to_ignore()?)
Ok(self.add_to_ignore())
}
_ => Ok(false),
};