gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-10-07 01:18:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3295 from gitbutlerapp/handle-git-push-update-refs-error

Browse Source 
feat(virtual_branches): handle push error with user-friendly message
This commit is contained in:
Kiril Videlov 2024-03-23 21:50:07 +01:00 committed by GitHub
commit 02dcc3f1e7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gitbutler-app/src/project_repository/repository.rs
View File

@ -1,5 +1,5 @@
use std::{
path,
any, path,
str::FromStr,
sync::{atomic::AtomicUsize, Arc},
};
@ -495,6 +495,7 @@ impl Repository {
ssh::check_known_host(&url).context("failed to check known host")?;
}
}
let mut update_refs_error: Option<git2::Error> = None;
for callback in callbacks {
let mut cbs: git2::RemoteCallbacks = callback.into();
if self.project.omit_certificate_check.unwrap_or(false) {
@ -502,15 +503,17 @@ impl Repository {
}
cbs.push_update_reference(|_reference: &str, status: Option<&str>| {
if let Some(status) = status {
update_refs_error = Some(git2::Error::from_str(status));
return Err(git2::Error::from_str(status));
};
Ok(())
});
match remote.push(
let push_result = remote.push(
&[refspec.as_str()],
Some(&mut git2::PushOptions::new().remote_callbacks(cbs)),
) {
);
match push_result {
Ok(()) => {
tracing::info!(
project_id = %self.project.id,
@ -529,7 +532,12 @@ impl Repository {
tracing::warn!(project_id = %self.project.id, ?error, "git push failed");
return Err(RemoteError::Network);
}
Err(error) => return Err(RemoteError::Other(error.into())),
Err(error) => {
if let Some(e) = update_refs_error.as_ref() {
return Err(RemoteError::Other(anyhow::anyhow!(e.to_string())));
}
return Err(RemoteError::Other(error.into()));
}
}
}
}

6
gitbutler-app/src/virtual_branches/commands.rs
View File

@ -415,7 +415,11 @@ pub async fn push_virtual_branch(
with_force,
Some((askpass_broker.inner().clone(), Some(branch_id))),
)
.await?;
.await
.map_err(|e| Error::UserError {
code: Code::Unknown,
message: e.to_string(),
})?;
emit_vbranches(&handle, &project_id).await;
Ok(())
}