gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-11-26 12:24:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2064 from gitbutlerapp/handle-git2-http-error

Browse Source 
Handle git2 http error
This commit is contained in:
Nikita Galaiko 2023-12-15 15:42:39 +01:00 committed by GitHub
commit a6b6a79268
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/tauri/src/git/error.rs
View File

@ -16,6 +16,8 @@ pub enum Error {
Network(git2::Error), Network(git2::Error),
#[error("hook error: {0}")] #[error("hook error: {0}")]
Hooks(#[from] git2_hooks::HooksError), Hooks(#[from] git2_hooks::HooksError),
#[error("http error: {0}")]
Http(git2::Error),
#[error(transparent)] #[error(transparent)]
Other(git2::Error), Other(git2::Error),
} }
@ -27,6 +29,7 @@ impl From<git2::Error> for Error {
git2::ErrorCode::GenericError | git2::ErrorCode::Auth => Error::Auth(err), git2::ErrorCode::GenericError | git2::ErrorCode::Auth => Error::Auth(err),
_ => Error::Other(err), _ => Error::Other(err),
}, },
git2::ErrorClass::Http => Error::Http(err),
git2::ErrorClass::Net => Error::Network(err), git2::ErrorClass::Net => Error::Network(err),
_ => match err.code() { _ => match err.code() {
git2::ErrorCode::NotFound => Error::NotFound(err), git2::ErrorCode::NotFound => Error::NotFound(err),

8
packages/tauri/src/project_repository/repository.rs
View File

@ -370,12 +370,12 @@ impl Repository {
); );
return Ok(()); return Ok(());
} }
Err(git::Error::Auth(error)) => { Err(git::Error::Auth(error) | git::Error::Http(error)) => {
tracing::warn!(project_id = %self.project.id, ?error, "git push failed",); tracing::warn!(project_id = %self.project.id, ?error, "git push failed");
continue; continue;
} }
Err(git::Error::Network(error)) => { Err(git::Error::Network(error)) => {
tracing::warn!(project_id = %self.project.id, ?error, "git push failed",); tracing::warn!(project_id = %self.project.id, ?error, "git push failed");
return Err(RemoteError::Network); return Err(RemoteError::Network);
} }
Err(error) => return Err(RemoteError::Other(error.into())), Err(error) => return Err(RemoteError::Other(error.into())),
@ -407,7 +407,7 @@ impl Repository {
tracing::info!(project_id = %self.project.id, %refspec, "git fetched"); tracing::info!(project_id = %self.project.id, %refspec, "git fetched");
return Ok(()); return Ok(());
} }
Err(git::Error::Auth(error)) => { Err(git::Error::Auth(error) | git::Error::Http(error)) => {
tracing::warn!(project_id = %self.project.id, ?error, "fetch failed"); tracing::warn!(project_id = %self.project.id, ?error, "fetch failed");
continue; continue;
} }