Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
190 changes: 190 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions asyncgit/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@ gix = { version = "0.71.0", default-features = false, features = [
"max-performance",
"revision",
"mailmap",
"blob-diff"
] }
gix-blame = "0.1.0"
log = "0.4"
# git2 = { path = "../../extern/git2-rs", features = ["vendored-openssl"]}
# git2 = { git="https://github.com/extrawurst/git2-rs.git", rev="fc13dcc", features = ["vendored-openssl"]}
Expand Down
40 changes: 40 additions & 0 deletions asyncgit/src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,32 @@ pub enum Error {
#[from] gix::object::find::existing::with_conversion::Error,
),

///
#[error("gix::traverse::commit::topo error: {0}")]
GixTraverseCommitTopo(#[from] gix::traverse::commit::topo::Error),

///
#[error("gix::repository::commit_graph_if_enabled error: {0}")]
GixRepositoryCommitGraphIfEnabled(
#[from] gix::repository::commit_graph_if_enabled::Error,
),

///
#[error("gix::repository::diff_resource_cache error: {0}")]
GixRepositoryDiffResourceCache(
#[from] Box<gix::repository::diff_resource_cache::Error>,
),

///
#[error("gix::config::diff::algorithm error: {0}")]
GixConfigDiffAlgorithm(
#[from] gix::config::diff::algorithm::Error,
),

///
#[error("gix_blame error: {0}")]
GixBlame(#[from] Box<gix_blame::Error>),

///
#[error("amend error: config commit.gpgsign=true detected.\ngpg signing is not supported for amending non-last commits")]
SignAmendNonLastCommit,
Expand Down Expand Up @@ -156,3 +182,17 @@ impl From<gix::discover::Error> for Error {
Self::GixDiscover(Box::new(error))
}
}

impl From<gix::repository::diff_resource_cache::Error> for Error {
fn from(
error: gix::repository::diff_resource_cache::Error,
) -> Self {
Self::GixRepositoryDiffResourceCache(Box::new(error))
}
}

impl From<gix_blame::Error> for Error {
fn from(error: gix_blame::Error) -> Self {
Self::GixBlame(Box::new(error))
}
}
Loading
Loading