mirror of
https://github.com/martinvonz/jj.git
synced 2024-11-28 09:14:04 +00:00
cargo: import fix_filter from gix::filter::plumbing
I don't think we need to declare these dependencies separately because both are the optional dependencies enabled by the git feature. We'll also need the gix's "attributes" feature at some point. > attributes - Query attributes and excludes. Enables access to pathspecs, > worktree checkouts, filter-pipelines and submodules. https://docs.rs/gix/0.67.0/gix/index.html#feature-flags
This commit is contained in:
parent
168f07283a
commit
eed32954b2
4 changed files with 4 additions and 6 deletions
1
Cargo.lock
generated
1
Cargo.lock
generated
|
@ -1872,7 +1872,6 @@ dependencies = [
|
|||
"futures 0.3.31",
|
||||
"git2",
|
||||
"gix",
|
||||
"gix-filter",
|
||||
"glob",
|
||||
"hashbrown 0.15.1",
|
||||
"hex",
|
||||
|
|
|
@ -58,11 +58,11 @@ git2 = { version = "0.19.0", features = [
|
|||
"vendored-libgit2"
|
||||
] }
|
||||
gix = { version = "0.66.0", default-features = false, features = [
|
||||
"attributes",
|
||||
"blob-diff",
|
||||
"index",
|
||||
"max-performance-safe",
|
||||
"blob-diff",
|
||||
] }
|
||||
gix-filter = "0.13.0"
|
||||
glob = "0.3.1"
|
||||
hashbrown = { version = "0.15.1", default-features = false, features = ["inline-more"] }
|
||||
hex = "0.4.3"
|
||||
|
|
|
@ -45,7 +45,6 @@ either = { workspace = true }
|
|||
futures = { workspace = true }
|
||||
git2 = { workspace = true, optional = true }
|
||||
gix = { workspace = true, optional = true }
|
||||
gix-filter = { workspace = true, optional = true }
|
||||
glob = { workspace = true }
|
||||
hashbrown = { workspace = true }
|
||||
hex = { workspace = true }
|
||||
|
@ -97,7 +96,7 @@ tokio = { workspace = true, features = ["full"] }
|
|||
|
||||
[features]
|
||||
default = ["git"]
|
||||
git = ["dep:git2", "dep:gix", "dep:gix-filter"]
|
||||
git = ["dep:git2", "dep:gix"]
|
||||
vendored-openssl = ["git2/vendored-openssl"]
|
||||
watchman = ["dep:tokio", "dep:watchman_client"]
|
||||
testing = ["git"]
|
||||
|
|
|
@ -430,7 +430,7 @@ impl GitBackend {
|
|||
);
|
||||
let filter = gix::diff::blob::Pipeline::new(
|
||||
Default::default(),
|
||||
gix_filter::Pipeline::new(
|
||||
gix::filter::plumbing::Pipeline::new(
|
||||
self.git_repo()
|
||||
.command_context()
|
||||
.map_err(|err| BackendError::Other(Box::new(err)))?,
|
||||
|
|
Loading…
Reference in a new issue