Skip to content

Commit

Permalink
third-party: Update gix libraries to the latest released versions
Browse files Browse the repository at this point in the history 
Summary:
ignore-conflict-markers

Since D63771328, we depended on my own fork as one of my fixes was ahead of the release, but since recent releases, we can go back to mainline now.

Followed steps in [wiki](https://www.internalfb.com/wiki/Rust/Third_Party_Libraries/Adding_or_Updating_Libraries)
```
./fbcode/common/rust/tools/reindeer/vendor
```

Reviewed By: mzr

Differential Revision: D66758489

fbshipit-source-id: bd1cf4461c8f593f64782f61db1746f97dd6e378
  • Loading branch information
@facebook-github-bot
Pierre Chevalier authored and facebook-github-bot committed Dec 4, 2024
1 parent b1c1ac3 commit 3fdd7cd
Show file tree
Hide file tree
Showing 16 changed files with 36 additions and 44 deletions.
2 changes: 1 addition & 1 deletion eden/mononoke/bonsai_git_mapping/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ caching_ext = { version = "0.1.0", path = "../common/rust/caching_ext" }
context = { version = "0.1.0", path = "../server/context" }
facet = { version = "0.1.0", git = "https://github.com/facebookexperimental/rust-shed.git", branch = "main" }
fbthrift = { version = "0.0.1+unstable", git = "https://github.com/facebook/fbthrift.git", branch = "main" }
gix-hash = { git = "https://github.com/pierrechevalier83/gitoxide", rev = "a080348c2fefb7a300ec80f4481617f870065589" }
gix-hash = "0.15.1"
justknobs = { version = "0.1.0", git = "https://github.com/facebookexperimental/rust-shed.git", branch = "main" }
memcache = { version = "0.1.0", git = "https://github.com/facebookexperimental/rust-shed.git", branch = "main" }
mononoke_types = { version = "0.1.0", path = "../mononoke_types" }
Expand Down
2 changes: 1 addition & 1 deletion eden/mononoke/features/repo_update_logger/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ context = { version = "0.1.0", path = "../../server/context" }
ephemeral_blobstore = { version = "0.1.0", path = "../../blobstore/ephemeral_blobstore" }
futures = { version = "0.3.30", features = ["async-await", "compat"] }
git_source_of_truth = { version = "0.1.0", path = "../../git_source_of_truth" }
gix-hash = { git = "https://github.com/pierrechevalier83/gitoxide", rev = "a080348c2fefb7a300ec80f4481617f870065589" }
gix-hash = "0.15.1"
hostname = { version = "0.1.0", git = "https://github.com/facebookexperimental/rust-shed.git", branch = "main" }
logger_ext = { version = "0.1.0", path = "../../common/logger_ext" }
metaconfig_types = { version = "0.1.0", path = "../../metaconfig/types" }
Expand Down
6 changes: 3 additions & 3 deletions eden/mononoke/git/git_types/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ flate2 = { version = "1.0.33", features = ["rust_backend"], default-features = f
futures = { version = "0.3.30", features = ["async-await", "compat"] }
git_delta = { version = "0.1.0", path = "../../third_party/git_delta" }
git_types_thrift = { version = "0.1.0", path = "if" }
gix-actor = { git = "https://github.com/pierrechevalier83/gitoxide", rev = "a080348c2fefb7a300ec80f4481617f870065589" }
gix-hash = { git = "https://github.com/pierrechevalier83/gitoxide", rev = "a080348c2fefb7a300ec80f4481617f870065589" }
gix-object = { git = "https://github.com/pierrechevalier83/gitoxide", rev = "a080348c2fefb7a300ec80f4481617f870065589" }
gix-actor = "0.33.1"
gix-hash = "0.15.1"
gix-object = "0.46.0"
itertools = "0.13.0"
lazy_static = "1.4"
manifest = { version = "0.1.0", path = "../../manifest" }
Expand Down
2 changes: 1 addition & 1 deletion eden/mononoke/git/gitimport/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ fbinit = { version = "0.2.0", git = "https://github.com/facebookexperimental/rus
filestore = { version = "0.1.0", path = "../../filestore" }
futures = { version = "0.3.30", features = ["async-await", "compat"] }
git_symbolic_refs = { version = "0.1.0", path = "../../git_symbolic_refs" }
gix-hash = { git = "https://github.com/pierrechevalier83/gitoxide", rev = "a080348c2fefb7a300ec80f4481617f870065589" }
gix-hash = "0.15.1"
import_direct = { version = "0.1.0", path = "../import_direct" }
import_tools = { version = "0.1.0", path = "../import_tools" }
linked-hash-map = { version = "0.5", features = ["serde_impl"] }
Expand Down
2 changes: 1 addition & 1 deletion eden/mononoke/git/import_direct/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ bytes = { version = "1.6.0", features = ["serde"] }
commit_graph = { version = "0.1.0", path = "../../repo_attributes/commit_graph/commit_graph" }
context = { version = "0.1.0", path = "../../server/context" }
filestore = { version = "0.1.0", path = "../../filestore" }
gix-hash = { git = "https://github.com/pierrechevalier83/gitoxide", rev = "a080348c2fefb7a300ec80f4481617f870065589" }
gix-hash = "0.15.1"
import_tools = { version = "0.1.0", path = "../import_tools" }
mononoke_api = { version = "0.1.0", path = "../../mononoke_api" }
mononoke_types = { version = "0.1.0", path = "../../mononoke_types" }
Expand Down
6 changes: 3 additions & 3 deletions eden/mononoke/git/import_tools/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ futures = { version = "0.3.30", features = ["async-await", "compat"] }
futures_stats = { version = "0.1.0", git = "https://github.com/facebookexperimental/rust-shed.git", branch = "main" }
git_symbolic_refs = { version = "0.1.0", path = "../../git_symbolic_refs" }
git_types = { version = "0.1.0", path = "../git_types" }
gix-actor = { git = "https://github.com/pierrechevalier83/gitoxide", rev = "a080348c2fefb7a300ec80f4481617f870065589" }
gix-hash = { git = "https://github.com/pierrechevalier83/gitoxide", rev = "a080348c2fefb7a300ec80f4481617f870065589" }
gix-object = { git = "https://github.com/pierrechevalier83/gitoxide", rev = "a080348c2fefb7a300ec80f4481617f870065589" }
gix-actor = "0.33.1"
gix-hash = "0.15.1"
gix-object = "0.46.0"
http = "0.2"
hyper = { version = "0.14.26", features = ["client", "http1", "http2", "stream"] }
hyper-openssl = "0.9"
Expand Down
8 changes: 4 additions & 4 deletions eden/mononoke/git/packfile/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ bytes = { version = "1.6.0", features = ["serde"] }
fbthrift = { version = "0.0.1+unstable", git = "https://github.com/facebook/fbthrift.git", branch = "main" }
flate2 = { version = "1.0.33", features = ["rust_backend"], default-features = false }
futures = { version = "0.3.30", features = ["async-await", "compat"] }
gix-features = { git = "https://github.com/pierrechevalier83/gitoxide", rev = "a080348c2fefb7a300ec80f4481617f870065589", features = ["parallel", "rustsha1"] }
gix-hash = { git = "https://github.com/pierrechevalier83/gitoxide", rev = "a080348c2fefb7a300ec80f4481617f870065589" }
gix-object = { git = "https://github.com/pierrechevalier83/gitoxide", rev = "a080348c2fefb7a300ec80f4481617f870065589" }
gix-pack = { git = "https://github.com/pierrechevalier83/gitoxide", rev = "a080348c2fefb7a300ec80f4481617f870065589" }
gix-features = { version = "0.39.1", features = ["parallel", "rustsha1"] }
gix-hash = "0.15.1"
gix-object = "0.46.0"
gix-pack = "0.55.0"
mononoke_types = { version = "0.1.0", path = "../../mononoke_types" }
packfile_thrift = { version = "0.1.0", path = "if" }
pin-project = "0.4.30"
Expand Down
10 changes: 5 additions & 5 deletions eden/mononoke/git/protocol/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ filestore = { version = "0.1.0", path = "../../filestore" }
futures = { version = "0.3.30", features = ["async-await", "compat"] }
git_symbolic_refs = { version = "0.1.0", path = "../../git_symbolic_refs" }
git_types = { version = "0.1.0", path = "../git_types" }
gix-date = { git = "https://github.com/pierrechevalier83/gitoxide", rev = "a080348c2fefb7a300ec80f4481617f870065589" }
gix-features = { git = "https://github.com/pierrechevalier83/gitoxide", rev = "a080348c2fefb7a300ec80f4481617f870065589", features = ["parallel", "rustsha1"] }
gix-hash = { git = "https://github.com/pierrechevalier83/gitoxide", rev = "a080348c2fefb7a300ec80f4481617f870065589" }
gix-object = { git = "https://github.com/pierrechevalier83/gitoxide", rev = "a080348c2fefb7a300ec80f4481617f870065589" }
gix-pack = { git = "https://github.com/pierrechevalier83/gitoxide", rev = "a080348c2fefb7a300ec80f4481617f870065589" }
gix-date = "0.9.2"
gix-features = { version = "0.39.1", features = ["parallel", "rustsha1"] }
gix-hash = "0.15.1"
gix-object = "0.46.0"
gix-pack = "0.55.0"
manifest = { version = "0.1.0", path = "../../manifest" }
metaconfig_types = { version = "0.1.0", path = "../../metaconfig/types" }
mononoke_types = { version = "0.1.0", path = "../../mononoke_types" }
Expand Down
10 changes: 5 additions & 5 deletions eden/mononoke/git_server/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ futures = { version = "0.3.30", features = ["async-await", "compat"] }
futures_stats = { version = "0.1.0", git = "https://github.com/facebookexperimental/rust-shed.git", branch = "main" }
git_source_of_truth = { version = "0.1.0", path = "../git_source_of_truth" }
git_types = { version = "0.1.0", path = "../git/git_types" }
gix-date = { git = "https://github.com/pierrechevalier83/gitoxide", rev = "a080348c2fefb7a300ec80f4481617f870065589" }
gix-hash = { git = "https://github.com/pierrechevalier83/gitoxide", rev = "a080348c2fefb7a300ec80f4481617f870065589" }
gix-object = { git = "https://github.com/pierrechevalier83/gitoxide", rev = "a080348c2fefb7a300ec80f4481617f870065589" }
gix-packetline = { git = "https://github.com/pierrechevalier83/gitoxide", rev = "a080348c2fefb7a300ec80f4481617f870065589", features = ["blocking-io"] }
gix-transport = { git = "https://github.com/pierrechevalier83/gitoxide", rev = "a080348c2fefb7a300ec80f4481617f870065589" }
gix-date = "0.9.2"
gix-hash = "0.15.1"
gix-object = "0.46.0"
gix-packetline = { version = "0.18.1", features = ["blocking-io"] }
gix-transport = "0.43.1"
gotham = "0.7.1"
gotham_derive = "0.7.0"
gotham_ext = { version = "0.1.0", path = "../gotham_ext" }
Expand Down
4 changes: 2 additions & 2 deletions eden/mononoke/mononoke_api/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ futures_watchdog = { version = "0.1.0", path = "../common/futures_watchdog" }
git_source_of_truth = { version = "0.1.0", path = "../git_source_of_truth" }
git_symbolic_refs = { version = "0.1.0", path = "../git_symbolic_refs" }
git_types = { version = "0.1.0", path = "../git/git_types" }
gix-hash = { git = "https://github.com/pierrechevalier83/gitoxide", rev = "a080348c2fefb7a300ec80f4481617f870065589" }
gix-hash = "0.15.1"
history_traversal = { version = "0.1.0", path = "../features/history_traversal" }
hook_manager = { version = "0.1.0", path = "../repo_attributes/hook_manager/hook_manager" }
hooks = { version = "0.1.0", path = "../hooks" }
Expand Down Expand Up @@ -120,7 +120,7 @@ cross_repo_sync_test_utils = { version = "0.1.0", path = "../commit_rewriting/cr
fbinit = { version = "0.2.0", git = "https://github.com/facebookexperimental/rust-shed.git", branch = "main" }
fbinit-tokio = { version = "0.1.2", git = "https://github.com/facebookexperimental/rust-shed.git", branch = "main" }
fixtures = { version = "0.1.0", path = "../tests/fixtures" }
gix-object = { git = "https://github.com/pierrechevalier83/gitoxide", rev = "a080348c2fefb7a300ec80f4481617f870065589" }
gix-object = "0.46.0"
mononoke_macros = { version = "0.1.0", path = "../mononoke_macros" }
pretty_assertions = { version = "1.2", features = ["alloc"], default-features = false }
test_repo_factory = { version = "0.1.0", path = "../repo_factory/test_repo_factory" }
Expand Down
4 changes: 2 additions & 2 deletions eden/mononoke/mononoke_types/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ either = "1.5"
faster-hex = "0.6.1"
fbthrift = { version = "0.0.1+unstable", git = "https://github.com/facebook/fbthrift.git", branch = "main" }
futures = { version = "0.3.30", features = ["async-await", "compat"] }
gix-date = { git = "https://github.com/pierrechevalier83/gitoxide", rev = "a080348c2fefb7a300ec80f4481617f870065589" }
gix-hash = { git = "https://github.com/pierrechevalier83/gitoxide", rev = "a080348c2fefb7a300ec80f4481617f870065589" }
gix-date = "0.9.2"
gix-hash = "0.15.1"
itertools = "0.13.0"
lazy_static = "1.4"
lfs_protocol = { version = "0.1.0", path = "../lfs_protocol" }
Expand Down
2 changes: 1 addition & 1 deletion eden/mononoke/repo_import/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ fbinit = { version = "0.2.0", git = "https://github.com/facebookexperimental/rus
filenodes = { version = "0.1.0", path = "../filenodes" }
filestore = { version = "0.1.0", path = "../filestore" }
futures = { version = "0.3.30", features = ["async-await", "compat"] }
gix-hash = { git = "https://github.com/pierrechevalier83/gitoxide", rev = "a080348c2fefb7a300ec80f4481617f870065589" }
gix-hash = "0.15.1"
import_direct = { version = "0.1.0", path = "../git/import_direct" }
import_tools = { version = "0.1.0", path = "../git/import_tools" }
itertools = "0.13.0"
Expand Down
2 changes: 1 addition & 1 deletion eden/mononoke/scs/scs_methods/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ futures_ext = { version = "0.1.0", git = "https://github.com/facebookexperimenta
futures_stats = { version = "0.1.0", git = "https://github.com/facebookexperimental/rust-shed.git", branch = "main" }
futures_watchdog = { version = "0.1.0", path = "../../common/futures_watchdog" }
git_types = { version = "0.1.0", path = "../../git/git_types" }
gix-hash = { git = "https://github.com/pierrechevalier83/gitoxide", rev = "a080348c2fefb7a300ec80f4481617f870065589" }
gix-hash = "0.15.1"
hooks = { version = "0.1.0", path = "../../hooks" }
itertools = "0.13.0"
justknobs = { version = "0.1.0", git = "https://github.com/facebookexperimental/rust-shed.git", branch = "main" }
Expand Down
8 changes: 2 additions & 6 deletions eden/mononoke/tests/integration/gitimport/test-gitimport-lfs-enabled-dangling-pointer.t
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,16 +124,12 @@ Inspect bonsai change
Tree {
entries: [
Entry {
mode: EntryMode(
33188,
),
mode: EntryMode(0o100644),
filename: "large_file",
oid: Sha1(1ab2b3357e304fef596198d92807d8d7e3580f0d),
},
Entry {
mode: EntryMode(
33188,
),
mode: EntryMode(0o100644),
filename: "small_file",
oid: Sha1(8910fc3d7dae273e6ffd1d3982af8dfc418af416),
},
Expand Down
8 changes: 2 additions & 6 deletions eden/mononoke/tests/integration/gitimport/test-gitimport-lfs-enabled.t
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,16 +104,12 @@ Inspect bonsai change
Tree {
entries: [
Entry {
mode: EntryMode(
33188,
),
mode: EntryMode(0o100644),
filename: "large_file",
oid: Sha1(1ab2b3357e304fef596198d92807d8d7e3580f0d),
},
Entry {
mode: EntryMode(
33188,
),
mode: EntryMode(0o100644),
filename: "small_file",
oid: Sha1(8910fc3d7dae273e6ffd1d3982af8dfc418af416),
},
Expand Down
4 changes: 2 additions & 2 deletions eden/mononoke/tools/admin/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ futures_stats = { version = "0.1.0", git = "https://github.com/facebookexperimen
git_source_of_truth = { version = "0.1.0", path = "../../git_source_of_truth" }
git_symbolic_refs = { version = "0.1.0", path = "../../git_symbolic_refs" }
git_types = { version = "0.1.0", path = "../../git/git_types" }
gix-hash = { git = "https://github.com/pierrechevalier83/gitoxide", rev = "a080348c2fefb7a300ec80f4481617f870065589" }
gix-object = { git = "https://github.com/pierrechevalier83/gitoxide", rev = "a080348c2fefb7a300ec80f4481617f870065589" }
gix-hash = "0.15.1"
gix-object = "0.46.0"
itertools = "0.13.0"
justknobs = { version = "0.1.0", git = "https://github.com/facebookexperimental/rust-shed.git", branch = "main" }
manifest = { version = "0.1.0", path = "../../manifest" }
Expand Down

0 comments on commit 3fdd7cd

Please sign in to comment.