From ca90f893f91705df9fdf3ab79df875f6e2ba2853 Mon Sep 17 00:00:00 2001 From: Pierre Chevalier Date: Wed, 28 Aug 2024 16:07:37 -0700 Subject: [PATCH] update gix crates to their latest published versions Summary: This is to make it easier to get https://github.com/Byron/gitoxide/pull/1543 once it's released upstream. There was an uncompatibility between `c2pa` which requires an older version of `url` as they want to have lawyers check the Unicode 3.0 license and `gix-url` which required latest `url` to support the nightly compiler. I "resolved" it by removing the restriction from `c2pa` and pointing at that for now. I also raised an issue upstream: https://github.com/contentauth/c2pa-rs/issues/571 to bring it back to their awareness, so hopefully we can move off my fork soon enough. Reviewed By: YousefSalama, dtolnay Differential Revision: D57676392 fbshipit-source-id: fc5cabc860de9200abf3fe1145a3dbdef2a96efa --- eden/fs/cli_rs/edenfs-client/Cargo.toml | 2 +- eden/mononoke/blobrepo_utils/Cargo.toml | 2 +- eden/mononoke/bonsai_git_mapping/Cargo.toml | 2 +- .../commit_rewriting/cross_repo_sync/Cargo.toml | 2 +- .../Cargo.toml | 2 +- eden/mononoke/derived_data/manager/Cargo.toml | 2 +- .../derived_data/skeleton_manifest_v2/Cargo.toml | 2 +- .../mononoke/derived_data/test_manifest/Cargo.toml | 2 +- .../derived_data/test_sharded_manifest/Cargo.toml | 2 +- .../mononoke/features/history_traversal/Cargo.toml | 2 +- .../features/repo_update_logger/Cargo.toml | 2 +- eden/mononoke/git/git_types/Cargo.toml | 8 ++++---- eden/mononoke/git/gitimport/Cargo.toml | 2 +- eden/mononoke/git/import_direct/Cargo.toml | 2 +- eden/mononoke/git/import_tools/Cargo.toml | 6 +++--- .../git/import_tools/src/gitimport_objects.rs | 12 ++++++------ eden/mononoke/git/packfile/Cargo.toml | 10 +++++----- eden/mononoke/git/packfile/src/types.rs | 2 +- eden/mononoke/git/packfile/test/packfile_test.rs | 14 ++++++++++---- eden/mononoke/git/protocol/Cargo.toml | 10 +++++----- eden/mononoke/git/protocol/src/pack_processor.rs | 7 ++++--- eden/mononoke/git_server/Cargo.toml | 14 +++++++------- eden/mononoke/mercurial/revlog/Cargo.toml | 2 +- eden/mononoke/mononoke_api/Cargo.toml | 4 ++-- eden/mononoke/mononoke_types/Cargo.toml | 6 +++--- eden/mononoke/repo_import/Cargo.toml | 2 +- .../integration/gitimport/test-gitimport-bad-tag.t | 2 +- .../test-gitimport-lfs-enabled-dangling-pointer.t | 8 ++++++-- .../gitimport/test-gitimport-lfs-enabled.t | 8 ++++++-- eden/mononoke/tools/admin/Cargo.toml | 6 +++--- eden/scm/lib/auth/Cargo.toml | 2 +- eden/scm/lib/commands/Cargo.toml | 2 +- eden/scm/lib/commands/commands/cmdclone/Cargo.toml | 2 +- eden/scm/lib/config/loader/Cargo.toml | 2 +- eden/scm/lib/doctor/network/Cargo.toml | 2 +- eden/scm/lib/edenapi/Cargo.toml | 2 +- eden/scm/lib/edenapi/trait/Cargo.toml | 2 +- eden/scm/lib/hg-http/Cargo.toml | 2 +- eden/scm/lib/http-client/Cargo.toml | 2 +- eden/scm/lib/revisionstore/Cargo.toml | 2 +- .../bindings/modules/pyauth/Cargo.toml | 2 +- 41 files changed, 92 insertions(+), 77 deletions(-) diff --git a/eden/fs/cli_rs/edenfs-client/Cargo.toml b/eden/fs/cli_rs/edenfs-client/Cargo.toml index f1bb9866688dd..a85284bd44be1 100644 --- a/eden/fs/cli_rs/edenfs-client/Cargo.toml +++ b/eden/fs/cli_rs/edenfs-client/Cargo.toml @@ -9,7 +9,7 @@ license = "GPLv2+" [dependencies] anyhow = "1.0.86" -async-recursion = "1.0.2" +async-recursion = "1.1.1" atomicfile = { version = "0.1.0", path = "../../../scm/lib/atomicfile" } byteorder = "1.3" dirs = "2.0" diff --git a/eden/mononoke/blobrepo_utils/Cargo.toml b/eden/mononoke/blobrepo_utils/Cargo.toml index 7f7bb9d7a5a95..3650d5c5e2340 100644 --- a/eden/mononoke/blobrepo_utils/Cargo.toml +++ b/eden/mononoke/blobrepo_utils/Cargo.toml @@ -13,7 +13,7 @@ path = "test/main.rs" [dependencies] anyhow = "1.0.86" -async-recursion = "1.0.2" +async-recursion = "1.1.1" blobrepo_hg = { version = "0.1.0", path = "../blobrepo/blobrepo_hg" } blobrepo_override = { version = "0.1.0", path = "../blobrepo/override" } blobstore = { version = "0.1.0", path = "../blobstore" } diff --git a/eden/mononoke/bonsai_git_mapping/Cargo.toml b/eden/mononoke/bonsai_git_mapping/Cargo.toml index 5b90f26bc8844..584f5d1a497bb 100644 --- a/eden/mononoke/bonsai_git_mapping/Cargo.toml +++ b/eden/mononoke/bonsai_git_mapping/Cargo.toml @@ -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 = "0.11" +gix-hash = "0.14.2" 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" } diff --git a/eden/mononoke/commit_rewriting/cross_repo_sync/Cargo.toml b/eden/mononoke/commit_rewriting/cross_repo_sync/Cargo.toml index 6e27fb1e8d0a8..9a355d490340a 100644 --- a/eden/mononoke/commit_rewriting/cross_repo_sync/Cargo.toml +++ b/eden/mononoke/commit_rewriting/cross_repo_sync/Cargo.toml @@ -13,7 +13,7 @@ path = "test/main.rs" [dependencies] anyhow = "1.0.86" -async-recursion = "1.0.2" +async-recursion = "1.1.1" async-trait = "0.1.71" blobstore = { version = "0.1.0", path = "../../blobstore" } bonsai_git_mapping = { version = "0.1.0", path = "../../bonsai_git_mapping" } diff --git a/eden/mononoke/derived_data/basename_suffix_skeleton_manifest_v3/Cargo.toml b/eden/mononoke/derived_data/basename_suffix_skeleton_manifest_v3/Cargo.toml index 3eb3c0d5b96d1..e47691c2aa0dc 100644 --- a/eden/mononoke/derived_data/basename_suffix_skeleton_manifest_v3/Cargo.toml +++ b/eden/mononoke/derived_data/basename_suffix_skeleton_manifest_v3/Cargo.toml @@ -27,7 +27,7 @@ skeleton_manifest = { version = "0.1.0", path = "../skeleton_manifest" } vec1 = { version = "1", features = ["serde"] } [dev-dependencies] -async-recursion = "1.0.2" +async-recursion = "1.1.1" bonsai_hg_mapping = { version = "0.1.0", path = "../../bonsai_hg_mapping" } bookmarks = { version = "0.1.0", path = "../../bookmarks" } commit_graph = { version = "0.1.0", path = "../../repo_attributes/commit_graph/commit_graph" } diff --git a/eden/mononoke/derived_data/manager/Cargo.toml b/eden/mononoke/derived_data/manager/Cargo.toml index 45bb987fa0e19..0159fb3cebf1b 100644 --- a/eden/mononoke/derived_data/manager/Cargo.toml +++ b/eden/mononoke/derived_data/manager/Cargo.toml @@ -12,7 +12,7 @@ path = "lib.rs" [dependencies] anyhow = "1.0.86" -async-recursion = "1.0.2" +async-recursion = "1.1.1" async-trait = "0.1.71" blobstore = { version = "0.1.0", path = "../../blobstore" } bonsai_git_mapping = { version = "0.1.0", path = "../../bonsai_git_mapping" } diff --git a/eden/mononoke/derived_data/skeleton_manifest_v2/Cargo.toml b/eden/mononoke/derived_data/skeleton_manifest_v2/Cargo.toml index 82f9266cb535c..a609eb3fe1aab 100644 --- a/eden/mononoke/derived_data/skeleton_manifest_v2/Cargo.toml +++ b/eden/mononoke/derived_data/skeleton_manifest_v2/Cargo.toml @@ -25,7 +25,7 @@ mononoke_types = { version = "0.1.0", path = "../../mononoke_types" } skeleton_manifest = { version = "0.1.0", path = "../skeleton_manifest" } [dev-dependencies] -async-recursion = "1.0.2" +async-recursion = "1.1.1" bonsai_hg_mapping = { version = "0.1.0", path = "../../bonsai_hg_mapping" } bookmarks = { version = "0.1.0", path = "../../bookmarks" } commit_graph = { version = "0.1.0", path = "../../repo_attributes/commit_graph/commit_graph" } diff --git a/eden/mononoke/derived_data/test_manifest/Cargo.toml b/eden/mononoke/derived_data/test_manifest/Cargo.toml index 1af4727614967..701e2e31deacb 100644 --- a/eden/mononoke/derived_data/test_manifest/Cargo.toml +++ b/eden/mononoke/derived_data/test_manifest/Cargo.toml @@ -23,7 +23,7 @@ mononoke_types = { version = "0.1.0", path = "../../mononoke_types" } skeleton_manifest = { version = "0.1.0", path = "../skeleton_manifest" } [dev-dependencies] -async-recursion = "1.0.2" +async-recursion = "1.1.1" bonsai_hg_mapping = { version = "0.1.0", path = "../../bonsai_hg_mapping" } bookmarks = { version = "0.1.0", path = "../../bookmarks" } commit_graph = { version = "0.1.0", path = "../../repo_attributes/commit_graph/commit_graph" } diff --git a/eden/mononoke/derived_data/test_sharded_manifest/Cargo.toml b/eden/mononoke/derived_data/test_sharded_manifest/Cargo.toml index 3adc8da59a1ff..818643c0e8e11 100644 --- a/eden/mononoke/derived_data/test_sharded_manifest/Cargo.toml +++ b/eden/mononoke/derived_data/test_sharded_manifest/Cargo.toml @@ -26,7 +26,7 @@ sorted_vector_map = { version = "0.2.0", git = "https://github.com/facebookexper test_manifest = { version = "0.1.0", path = "../test_manifest" } [dev-dependencies] -async-recursion = "1.0.2" +async-recursion = "1.1.1" bonsai_hg_mapping = { version = "0.1.0", path = "../../bonsai_hg_mapping" } bookmarks = { version = "0.1.0", path = "../../bookmarks" } commit_graph = { version = "0.1.0", path = "../../repo_attributes/commit_graph/commit_graph" } diff --git a/eden/mononoke/features/history_traversal/Cargo.toml b/eden/mononoke/features/history_traversal/Cargo.toml index d64e1a09420b6..1dfe990fdd3be 100644 --- a/eden/mononoke/features/history_traversal/Cargo.toml +++ b/eden/mononoke/features/history_traversal/Cargo.toml @@ -9,7 +9,7 @@ license = "GPLv2+" [dependencies] anyhow = "1.0.86" -async-recursion = "1.0.2" +async-recursion = "1.1.1" async-trait = "0.1.71" blame = { version = "0.1.0", path = "../../derived_data/blame" } blobstore = { version = "0.1.0", path = "../../blobstore" } diff --git a/eden/mononoke/features/repo_update_logger/Cargo.toml b/eden/mononoke/features/repo_update_logger/Cargo.toml index fba5feb63d01d..05734e0988069 100644 --- a/eden/mononoke/features/repo_update_logger/Cargo.toml +++ b/eden/mononoke/features/repo_update_logger/Cargo.toml @@ -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 = "0.11" +gix-hash = "0.14.2" 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" } diff --git a/eden/mononoke/git/git_types/Cargo.toml b/eden/mononoke/git/git_types/Cargo.toml index 0d379010d6c4b..02609dea99904 100644 --- a/eden/mononoke/git/git_types/Cargo.toml +++ b/eden/mononoke/git/git_types/Cargo.toml @@ -19,13 +19,13 @@ derived_data_manager = { version = "0.1.0", path = "../../derived_data/manager" derived_data_service_if = { version = "0.1.0", path = "../../derived_data/remote/if" } digest = "0.10" filestore = { version = "0.1.0", path = "../../filestore" } -flate2 = { version = "1.0.26", features = ["rust_backend"], default-features = false } +flate2 = { version = "1.0.33", features = ["rust_backend"], default-features = false } 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 = "0.24" -gix-hash = "0.11" -gix-object = "0.33" +gix-actor = "0.32.0" +gix-hash = "0.14.2" +gix-object = "0.44.0" itertools = "0.11.0" lazy_static = "1.4" manifest = { version = "0.1.0", path = "../../manifest" } diff --git a/eden/mononoke/git/gitimport/Cargo.toml b/eden/mononoke/git/gitimport/Cargo.toml index 760f11e0b2bd8..2c52796c16f3e 100644 --- a/eden/mononoke/git/gitimport/Cargo.toml +++ b/eden/mononoke/git/gitimport/Cargo.toml @@ -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 = "0.11" +gix-hash = "0.14.2" 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"] } diff --git a/eden/mononoke/git/import_direct/Cargo.toml b/eden/mononoke/git/import_direct/Cargo.toml index 149cc6cb0fee7..a89f16e67554c 100644 --- a/eden/mononoke/git/import_direct/Cargo.toml +++ b/eden/mononoke/git/import_direct/Cargo.toml @@ -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 = "0.11" +gix-hash = "0.14.2" 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" } diff --git a/eden/mononoke/git/import_tools/Cargo.toml b/eden/mononoke/git/import_tools/Cargo.toml index 4dd370dd2e478..454e596a79258 100644 --- a/eden/mononoke/git/import_tools/Cargo.toml +++ b/eden/mononoke/git/import_tools/Cargo.toml @@ -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 = "0.24" -gix-hash = "0.11" -gix-object = "0.33" +gix-actor = "0.32.0" +gix-hash = "0.14.2" +gix-object = "0.44.0" http = "0.2" hyper = { version = "0.14.26", features = ["client", "http1", "http2", "stream"] } hyper-openssl = "0.9" diff --git a/eden/mononoke/git/import_tools/src/gitimport_objects.rs b/eden/mononoke/git/import_tools/src/gitimport_objects.rs index 69dd27a6fc093..3644abb62adc2 100644 --- a/eden/mononoke/git/import_tools/src/gitimport_objects.rs +++ b/eden/mononoke/git/import_tools/src/gitimport_objects.rs @@ -109,24 +109,24 @@ async fn load_git_tree( Err(e) => return Some(Err(e)), }; - let r = match mode { - tree::EntryMode::Blob => { + let r = match mode.into() { + tree::EntryKind::Blob => { Some((name, Entry::Leaf((FileType::Regular, GitLeaf(oid))))) } - tree::EntryMode::BlobExecutable => { + tree::EntryKind::BlobExecutable => { Some((name, Entry::Leaf((FileType::Executable, GitLeaf(oid))))) } - tree::EntryMode::Link => { + tree::EntryKind::Link => { Some((name, Entry::Leaf((FileType::Symlink, GitLeaf(oid))))) } - tree::EntryMode::Tree => Some((name, Entry::Tree(GitTree(oid)))), + tree::EntryKind::Tree => Some((name, Entry::Tree(GitTree(oid)))), // Git submodules are represented as ObjectType::Commit inside the tree. // // Depending on the repository configuration, we may or may not wish to // include submodules in the imported manifest. Generate a leaf on the // basis of the SUBMODULES parameter. - tree::EntryMode::Commit => { + tree::EntryKind::Commit => { if SUBMODULES { Some((name, Entry::Leaf((FileType::GitSubmodule, GitLeaf(oid))))) } else { diff --git a/eden/mononoke/git/packfile/Cargo.toml b/eden/mononoke/git/packfile/Cargo.toml index 6bff5102268ce..b581b061f3602 100644 --- a/eden/mononoke/git/packfile/Cargo.toml +++ b/eden/mononoke/git/packfile/Cargo.toml @@ -16,12 +16,12 @@ anyhow = "1.0.86" blobstore = { version = "0.1.0", path = "../../blobstore" } 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.26", features = ["rust_backend"], default-features = false } +flate2 = { version = "1.0.33", features = ["rust_backend"], default-features = false } futures = { version = "0.3.30", features = ["async-await", "compat"] } -gix-features = { version = "0.32", features = ["parallel", "rustsha1"] } -gix-hash = "0.11" -gix-object = "0.33" -gix-pack = "0.40" +gix-features = { version = "0.38.2", features = ["parallel", "rustsha1"] } +gix-hash = "0.14.2" +gix-object = "0.44.0" +gix-pack = "0.53.0" mononoke_types = { version = "0.1.0", path = "../../mononoke_types" } packfile_thrift = { version = "0.1.0", path = "if" } pin-project = "0.4.30" diff --git a/eden/mononoke/git/packfile/src/types.rs b/eden/mononoke/git/packfile/src/types.rs index 67965c0bb83ed..61c4ae7885d61 100644 --- a/eden/mononoke/git/packfile/src/types.rs +++ b/eden/mononoke/git/packfile/src/types.rs @@ -161,7 +161,7 @@ impl BaseObject { /// The uncompressed size of the Git object contained within the pack item. pub fn size(&self) -> usize { - self.object.size() + self.object.size() as usize } /// The 20-byte SHA1 hash (ObjectId) of the Git object contained within the diff --git a/eden/mononoke/git/packfile/test/packfile_test.rs b/eden/mononoke/git/packfile/test/packfile_test.rs index 6971238be81d8..3348882d470db 100644 --- a/eden/mononoke/git/packfile/test/packfile_test.rs +++ b/eden/mononoke/git/packfile/test/packfile_test.rs @@ -46,7 +46,7 @@ async fn get_objects_stream( }))?); let tree_bytes = Bytes::from(to_vec_bytes(&gix_object::Object::Tree(gix_object::Tree { entries: vec![gix_object::tree::Entry { - mode: gix_object::tree::EntryMode::Blob, + mode: gix_object::tree::EntryKind::Blob.into(), filename: "JustAFile.txt".into(), oid: ObjectId::empty_blob(gix_hash::Kind::Sha1), }], @@ -190,7 +190,10 @@ async fn validate_packfile_generation_format() -> anyhow::Result<()> { assert_eq!(opened_packfile.data_len(), size as usize); // Verify the checksum of the packfile let checksum_from_file = opened_packfile - .verify_checksum(gix_features::progress::Discard, &AtomicBool::new(false)) + .verify_checksum( + &mut gix_features::progress::Discard, + &AtomicBool::new(false), + ) .expect("Expected successful checksum computation"); // Verify the checksum matches the hash generated when computing the packfile assert_eq!(checksum, checksum_from_file); @@ -226,7 +229,7 @@ async fn validate_staggered_packfile_generation() -> anyhow::Result<()> { .expect("Expected successful write of object to packfile"); let tree_bytes = Bytes::from(to_vec_bytes(&gix_object::Object::Tree(gix_object::Tree { entries: vec![gix_object::tree::Entry { - mode: gix_object::tree::EntryMode::Blob, + mode: gix_object::tree::EntryKind::Blob.into(), filename: "JustAFile.txt".into(), oid: ObjectId::empty_blob(gix_hash::Kind::Sha1), }], @@ -260,7 +263,10 @@ async fn validate_staggered_packfile_generation() -> anyhow::Result<()> { assert_eq!(opened_packfile.data_len(), size as usize); // Verify the checksum of the packfile let checksum_from_file = opened_packfile - .verify_checksum(gix_features::progress::Discard, &AtomicBool::new(false)) + .verify_checksum( + &mut gix_features::progress::Discard, + &AtomicBool::new(false), + ) .expect("Expected successful checksum computation"); // Verify the checksum matches the hash generated when computing the packfile assert_eq!(checksum, checksum_from_file); diff --git a/eden/mononoke/git/protocol/Cargo.toml b/eden/mononoke/git/protocol/Cargo.toml index 180a58b970197..8a608ba64178f 100644 --- a/eden/mononoke/git/protocol/Cargo.toml +++ b/eden/mononoke/git/protocol/Cargo.toml @@ -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 = "0.7" -gix-features = { version = "0.32", features = ["parallel", "rustsha1"] } -gix-hash = "0.11" -gix-object = "0.33" -gix-pack = "0.40" +gix-date = "0.9.0" +gix-features = { version = "0.38.2", features = ["parallel", "rustsha1"] } +gix-hash = "0.14.2" +gix-object = "0.44.0" +gix-pack = "0.53.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" } diff --git a/eden/mononoke/git/protocol/src/pack_processor.rs b/eden/mononoke/git/protocol/src/pack_processor.rs index 3c1a72cca5650..e0259b3565ed3 100644 --- a/eden/mononoke/git/protocol/src/pack_processor.rs +++ b/eden/mononoke/git/protocol/src/pack_processor.rs @@ -60,7 +60,7 @@ fn git_object_bytes( kind: gix_object::Kind, size: usize, ) -> Vec { - let mut object_bytes = loose_header(kind, size).into_vec(); + let mut object_bytes = loose_header(kind, size as u64).into_vec(); object_bytes.extend(headerless_object_bytes); object_bytes } @@ -159,7 +159,7 @@ async fn parse_stored_pack( })?; // Verify that the packfile is valid pack_file - .verify_checksum(Discard, &AtomicBool::new(false)) + .verify_checksum(&mut Discard, &AtomicBool::new(false)) .context("The checksum of the packfile is invalid")?; // Load all the prerequisite objects @@ -178,7 +178,8 @@ async fn parse_stored_pack( .decode_entry( into_data_entry(entry), &mut output, - |oid, out| resolve_delta(oid, out, &prereq_objects), + &mut gix_features::zlib::Inflate::default(), + &|oid, out| resolve_delta(oid, out, &prereq_objects), &mut Never, ) .context(err_context)?; diff --git a/eden/mononoke/git_server/Cargo.toml b/eden/mononoke/git_server/Cargo.toml index 5135c73a0eded..075f5ddd5436d 100644 --- a/eden/mononoke/git_server/Cargo.toml +++ b/eden/mononoke/git_server/Cargo.toml @@ -9,7 +9,7 @@ license = "GPLv2+" [dependencies] anyhow = "1.0.86" -async-recursion = "1.0.2" +async-recursion = "1.1.1" async-stream = "0.3" async-trait = "0.1.71" bonsai_git_mapping = { version = "0.1.0", path = "../bonsai_git_mapping" } @@ -24,16 +24,16 @@ context = { version = "0.1.0", path = "../server/context" } environment = { version = "0.1.0", path = "../cmdlib/environment" } executor_lib = { version = "0.1.0", path = "../cmdlib/sharding" } fbinit = { version = "0.2.0", git = "https://github.com/facebookexperimental/rust-shed.git", branch = "main" } -flate2 = { version = "1.0.26", features = ["rust_backend"], default-features = false } +flate2 = { version = "1.0.33", features = ["rust_backend"], default-features = false } 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 = "0.7" -gix-hash = "0.11" -gix-object = "0.33" -gix-packetline = { version = "0.17.2", features = ["blocking-io"] } -gix-transport = "0.41" +gix-date = "0.9.0" +gix-hash = "0.14.2" +gix-object = "0.44.0" +gix-packetline = { version = "0.17.6", features = ["blocking-io"] } +gix-transport = "0.42.3" gotham = "0.7.1" gotham_derive = "0.7.0" gotham_ext = { version = "0.1.0", path = "../gotham_ext" } diff --git a/eden/mononoke/mercurial/revlog/Cargo.toml b/eden/mononoke/mercurial/revlog/Cargo.toml index 7f201f90bbb60..22306dac481e0 100644 --- a/eden/mononoke/mercurial/revlog/Cargo.toml +++ b/eden/mononoke/mercurial/revlog/Cargo.toml @@ -15,7 +15,7 @@ anyhow = "1.0.86" ascii = "1.0" bitflags = { version = "2.4", features = ["serde"] } bytes = { version = "1.6.0", features = ["serde"] } -flate2 = { version = "1.0.26", features = ["rust_backend"], default-features = false } +flate2 = { version = "1.0.33", features = ["rust_backend"], default-features = false } futures_ext = { package = "futures_01_ext", version = "0.1.0", git = "https://github.com/facebookexperimental/rust-shed.git", branch = "main" } futures_old = { package = "futures", version = "0.1.31" } lz4-pyframe = { version = "0.1.0", path = "../../../scm/lib/lz4-pyframe" } diff --git a/eden/mononoke/mononoke_api/Cargo.toml b/eden/mononoke/mononoke_api/Cargo.toml index 3478c4ff6c269..bc088569ec929 100644 --- a/eden/mononoke/mononoke_api/Cargo.toml +++ b/eden/mononoke/mononoke_api/Cargo.toml @@ -52,7 +52,7 @@ 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 = "0.11" +gix-hash = "0.14.2" 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" } @@ -116,7 +116,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 = "0.33" +gix-object = "0.44.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" } diff --git a/eden/mononoke/mononoke_types/Cargo.toml b/eden/mononoke/mononoke_types/Cargo.toml index f5c8b9aa774d3..61327dbb68ca9 100644 --- a/eden/mononoke/mononoke_types/Cargo.toml +++ b/eden/mononoke/mononoke_types/Cargo.toml @@ -12,7 +12,7 @@ abomonation = { version = "0.7", features = ["smallvec"] } abomonation_derive = "0.5" anyhow = "1.0.86" ascii = "1.0" -async-recursion = "1.0.2" +async-recursion = "1.1.1" async-trait = "0.1.71" bincode = "1.3.3" bit-set = "0.5" @@ -30,8 +30,8 @@ edenapi_types = { version = "0.1.0", path = "../../scm/lib/edenapi/types" } 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 = "0.7" -gix-hash = "0.11" +gix-date = "0.9.0" +gix-hash = "0.14.2" itertools = "0.11.0" lazy_static = "1.4" lfs_protocol = { version = "0.1.0", path = "../lfs_protocol" } diff --git a/eden/mononoke/repo_import/Cargo.toml b/eden/mononoke/repo_import/Cargo.toml index e1a72e75e2d88..3a6fd7490dc0d 100644 --- a/eden/mononoke/repo_import/Cargo.toml +++ b/eden/mononoke/repo_import/Cargo.toml @@ -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 = "0.11" +gix-hash = "0.14.2" import_direct = { version = "0.1.0", path = "../git/import_direct" } import_tools = { version = "0.1.0", path = "../git/import_tools" } itertools = "0.11.0" diff --git a/eden/mononoke/tests/integration/gitimport/test-gitimport-bad-tag.t b/eden/mononoke/tests/integration/gitimport/test-gitimport-bad-tag.t index b6ba925491f26..ebf03fd037364 100644 --- a/eden/mononoke/tests/integration/gitimport/test-gitimport-bad-tag.t +++ b/eden/mononoke/tests/integration/gitimport/test-gitimport-bad-tag.t @@ -82,7 +82,7 @@ tagger mononoke ``` into object of kind Tag - + 2: object parsing failed Error: Execution failed diff --git a/eden/mononoke/tests/integration/gitimport/test-gitimport-lfs-enabled-dangling-pointer.t b/eden/mononoke/tests/integration/gitimport/test-gitimport-lfs-enabled-dangling-pointer.t index 282e556d062c8..a1f24f26459d2 100644 --- a/eden/mononoke/tests/integration/gitimport/test-gitimport-lfs-enabled-dangling-pointer.t +++ b/eden/mononoke/tests/integration/gitimport/test-gitimport-lfs-enabled-dangling-pointer.t @@ -130,12 +130,16 @@ Inspect bonsai change Tree { entries: [ Entry { - mode: Blob, + mode: EntryMode( + 33188, + ), filename: "large_file", oid: Sha1(1ab2b3357e304fef596198d92807d8d7e3580f0d), }, Entry { - mode: Blob, + mode: EntryMode( + 33188, + ), filename: "small_file", oid: Sha1(8910fc3d7dae273e6ffd1d3982af8dfc418af416), }, diff --git a/eden/mononoke/tests/integration/gitimport/test-gitimport-lfs-enabled.t b/eden/mononoke/tests/integration/gitimport/test-gitimport-lfs-enabled.t index 2e6d72b936efa..706cbcfb27c55 100644 --- a/eden/mononoke/tests/integration/gitimport/test-gitimport-lfs-enabled.t +++ b/eden/mononoke/tests/integration/gitimport/test-gitimport-lfs-enabled.t @@ -110,12 +110,16 @@ Inspect bonsai change Tree { entries: [ Entry { - mode: Blob, + mode: EntryMode( + 33188, + ), filename: "large_file", oid: Sha1(1ab2b3357e304fef596198d92807d8d7e3580f0d), }, Entry { - mode: Blob, + mode: EntryMode( + 33188, + ), filename: "small_file", oid: Sha1(8910fc3d7dae273e6ffd1d3982af8dfc418af416), }, diff --git a/eden/mononoke/tools/admin/Cargo.toml b/eden/mononoke/tools/admin/Cargo.toml index 39987756dcf48..7a454caa34f8c 100644 --- a/eden/mononoke/tools/admin/Cargo.toml +++ b/eden/mononoke/tools/admin/Cargo.toml @@ -52,15 +52,15 @@ fbthrift = { version = "0.0.1+unstable", git = "https://github.com/facebook/fbth fileblob = { version = "0.1.0", path = "../../blobstore/fileblob" } filenodes = { version = "0.1.0", path = "../../filenodes" } filestore = { version = "0.1.0", path = "../../filestore" } -flate2 = { version = "1.0.26", features = ["rust_backend"], default-features = false } +flate2 = { version = "1.0.33", features = ["rust_backend"], default-features = false } fsnodes = { version = "0.1.0", path = "../../derived_data/fsnodes" } 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_symbolic_refs = { version = "0.1.0", path = "../../git_symbolic_refs" } git_types = { version = "0.1.0", path = "../../git/git_types" } -gix-hash = "0.11" -gix-object = "0.33" +gix-hash = "0.14.2" +gix-object = "0.44.0" manifest = { version = "0.1.0", path = "../../manifest" } megarepo_api = { version = "0.1.0", path = "../../megarepo_api" } megarepo_error = { version = "0.1.0", path = "../../megarepo_api/megarepo_error" } diff --git a/eden/scm/lib/auth/Cargo.toml b/eden/scm/lib/auth/Cargo.toml index 450e02bed0004..8c8c4276e634e 100644 --- a/eden/scm/lib/auth/Cargo.toml +++ b/eden/scm/lib/auth/Cargo.toml @@ -14,7 +14,7 @@ pem = "3.0.3" simple_asn1 = "0.5.4" thiserror = "1.0.49" tracing = { version = "0.1.40", features = ["attributes", "valuable"] } -url = "2.2.2" +url = "2.5.2" util = { version = "0.1.0", path = "../util" } [dev-dependencies] diff --git a/eden/scm/lib/commands/Cargo.toml b/eden/scm/lib/commands/Cargo.toml index 050184400cbb1..4cb352ecad3d7 100644 --- a/eden/scm/lib/commands/Cargo.toml +++ b/eden/scm/lib/commands/Cargo.toml @@ -53,7 +53,7 @@ configmodel = { version = "0.1.0", path = "../config/model" } constructors = { version = "0.1.0", path = "../constructors", features = ["git"] } ctrlc = { version = "3.1", features = ["termination"] } fail = { version = "0.4", features = ["failpoints"] } -flate2 = { version = "1.0.26", features = ["rust_backend"], default-features = false } +flate2 = { version = "1.0.33", features = ["rust_backend"], default-features = false } hg-http = { version = "0.1.0", path = "../hg-http" } hg-metrics = { version = "0.1.0", path = "../hg-metrics" } hgplain = { version = "0.1.0", path = "../util/hgplain" } diff --git a/eden/scm/lib/commands/commands/cmdclone/Cargo.toml b/eden/scm/lib/commands/commands/cmdclone/Cargo.toml index 02fd2165585ff..9eea98dfe3aa0 100644 --- a/eden/scm/lib/commands/commands/cmdclone/Cargo.toml +++ b/eden/scm/lib/commands/commands/cmdclone/Cargo.toml @@ -25,5 +25,5 @@ repo = { version = "0.1.0", path = "../../../repo" } repo_name = { version = "0.1.0", path = "../../../repo_name" } tracing = { version = "0.1.40", features = ["attributes", "valuable"] } types = { version = "0.1.0", path = "../../../types" } -url = "2.2.2" +url = "2.5.2" util = { version = "0.1.0", path = "../../../util" } diff --git a/eden/scm/lib/config/loader/Cargo.toml b/eden/scm/lib/config/loader/Cargo.toml index 932848711d88e..2258aaf7a14d2 100644 --- a/eden/scm/lib/config/loader/Cargo.toml +++ b/eden/scm/lib/config/loader/Cargo.toml @@ -40,7 +40,7 @@ tempfile = { version = "3.8", optional = true } tracing = { version = "0.1.40", features = ["attributes", "valuable"] } types = { version = "0.1.0", path = "../../types", optional = true } unionconfig = { version = "0.1.0", path = "../union" } -url = "2.2.2" +url = "2.5.2" util = { version = "0.1.0", path = "../../util" } version = { version = "0.1.0", path = "../../version" } zstd = { version = "0.13", features = ["experimental", "zstdmt"], optional = true } diff --git a/eden/scm/lib/doctor/network/Cargo.toml b/eden/scm/lib/doctor/network/Cargo.toml index f66cc817d987a..af322ae83cf96 100644 --- a/eden/scm/lib/doctor/network/Cargo.toml +++ b/eden/scm/lib/doctor/network/Cargo.toml @@ -14,7 +14,7 @@ http = "0.2" http-client = { version = "0.1.0", path = "../../http-client" } thiserror = "1.0.49" tracing = { version = "0.1.40", features = ["attributes", "valuable"] } -url = "2.2.2" +url = "2.5.2" [dev-dependencies] tempfile = "3.8" diff --git a/eden/scm/lib/edenapi/Cargo.toml b/eden/scm/lib/edenapi/Cargo.toml index 4cc1eb30effc8..002112b3edecf 100644 --- a/eden/scm/lib/edenapi/Cargo.toml +++ b/eden/scm/lib/edenapi/Cargo.toml @@ -32,5 +32,5 @@ serde_json = { version = "1.0.100", features = ["float_roundtrip", "unbounded_de tokio = { version = "1.37.0", features = ["full", "test-util", "tracing"] } tracing = { version = "0.1.40", features = ["attributes", "valuable"] } types = { version = "0.1.0", path = "../types" } -url = "2.2.2" +url = "2.5.2" version = { version = "0.1.0", path = "../version" } diff --git a/eden/scm/lib/edenapi/trait/Cargo.toml b/eden/scm/lib/edenapi/trait/Cargo.toml index 9c0cc8499339b..fb78cb4dd5a64 100644 --- a/eden/scm/lib/edenapi/trait/Cargo.toml +++ b/eden/scm/lib/edenapi/trait/Cargo.toml @@ -18,4 +18,4 @@ minibytes = { version = "0.1.0", path = "../../minibytes" } serde_cbor = "0.11" thiserror = "1.0.49" types = { version = "0.1.0", path = "../../types" } -url = "2.2.2" +url = "2.5.2" diff --git a/eden/scm/lib/hg-http/Cargo.toml b/eden/scm/lib/hg-http/Cargo.toml index add659de7b62d..bf2cd70a40b5a 100644 --- a/eden/scm/lib/hg-http/Cargo.toml +++ b/eden/scm/lib/hg-http/Cargo.toml @@ -14,4 +14,4 @@ hg-metrics = { version = "0.1.0", path = "../hg-metrics" } http-client = { version = "0.1.0", path = "../http-client" } once_cell = "1.12" progress-model = { version = "0.1.0", path = "../progress/model" } -url = "2.2.2" +url = "2.5.2" diff --git a/eden/scm/lib/http-client/Cargo.toml b/eden/scm/lib/http-client/Cargo.toml index d2f117b0a8a41..96f55d021ac1a 100644 --- a/eden/scm/lib/http-client/Cargo.toml +++ b/eden/scm/lib/http-client/Cargo.toml @@ -36,7 +36,7 @@ thiserror = "1.0.49" tokio = { version = "1.37.0", features = ["full", "test-util", "tracing"] } tokio-util = { version = "0.7.10", features = ["full"] } tracing = { version = "0.1.40", features = ["attributes", "valuable"] } -url = "2.2.2" +url = "2.5.2" [dev-dependencies] assert_matches = "1.5" diff --git a/eden/scm/lib/revisionstore/Cargo.toml b/eden/scm/lib/revisionstore/Cargo.toml index d16d3935f0f6a..3335a02920da0 100644 --- a/eden/scm/lib/revisionstore/Cargo.toml +++ b/eden/scm/lib/revisionstore/Cargo.toml @@ -59,7 +59,7 @@ tokio = { version = "1.37.0", features = ["full", "test-util", "tracing"] } tokio-stream = { version = "0.1.14", features = ["fs", "io-util", "net", "signal", "sync", "time"] } tracing = { version = "0.1.40", features = ["attributes", "valuable"] } types = { version = "0.1.0", path = "../types" } -url = "2.2.2" +url = "2.5.2" util = { version = "0.1.0", path = "../util" } version = { version = "0.1.0", path = "../version" } vlqencoding = { version = "0.1.0", path = "../vlqencoding" } diff --git a/eden/scm/saplingnative/bindings/modules/pyauth/Cargo.toml b/eden/scm/saplingnative/bindings/modules/pyauth/Cargo.toml index 2b0f8c3dcb322..334d1f3d6548a 100644 --- a/eden/scm/saplingnative/bindings/modules/pyauth/Cargo.toml +++ b/eden/scm/saplingnative/bindings/modules/pyauth/Cargo.toml @@ -11,4 +11,4 @@ auth = { version = "0.1.0", path = "../../../../lib/auth" } cpython = { version = "0.7.2", default-features = false } cpython_ext = { version = "0.1.0", path = "../../../../lib/cpython-ext" } pyconfigloader = { version = "0.1.0", path = "../pyconfigloader" } -url = "2.2.2" +url = "2.5.2"