git.iko.soy/helix
on master help sign in
build(deps): bump gix from 0.55.2 to 0.56.0 (#9055)

* build(deps): bump gix from 0.55.2 to 0.56.0 Bumps [gix](https://github.com/Byron/gitoxide) from 0.55.2 to 0.56.0. - [Release notes](https://github.com/Byron/gitoxide/releases) - [Changelog](https://github.com/Byron/gitoxide/blob/main/CHANGELOG.md) - [Commits](https://github.com/Byron/gitoxide/compare/gix-v0.55.2...gix-v0.56.0) --- updated-dependencies: - dependency-name: gix dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Adapt to changes in gix EntryMode/EntryKind The rest of the gix codebase now calls `.kind()` on the mode and uses the renamed `EntryKind` enum. --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Michael Davis <mcarsondavis@gmail.com>

commit49dffa7d24a6a8f08444b9f10b9f6398100f9d1f authordependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> dateWed 13 Dec 2023, 02:29 (3 years ago) parentf036451
3 files changed+78−86
compare with master
unifiedsplit
Cargo.lock+73−81 helix-vcs/Cargo.toml+1−1 helix-vcs/src/git.rs+4−4
Cargo.lock+73−81
@@ -415,9 +415,9 @@ dependencies = [
415415
416416[[package]]
417417name = "faster-hex"
418−version = "0.8.1"
418+version = "0.9.0"
419419source = "registry+https://github.com/rust-lang/crates.io-index"
420−checksum = "239f7bfb930f820ab16a9cd95afc26f88264cf6905c960b340a615384aa3338a"
420+checksum = "a2a2b11eda1d40935b26cf18f6833c526845ae8c41e58d09af6adeb6f0269183"
421421dependencies = [
422422 "serde",
423423]
@@ -522,9 +522,9 @@ checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e"
522522
523523[[package]]
524524name = "gix"
525−version = "0.55.2"
525+version = "0.56.0"
526526source = "registry+https://github.com/rust-lang/crates.io-index"
527−checksum = "002667cd1ebb789313d0d0afe3d23b2821cf3b0e91605095f0e6d8751f0ceeea"
527+checksum = "5b0dcdc9c60d66535897fa40a7ea2a635e72f99456b1d9ae86b7e170e80618cb"
528528dependencies = [
529529 "gix-actor",
530530 "gix-commitgraph",
@@ -563,46 +563,46 @@ dependencies = [
563563
564564[[package]]
565565name = "gix-actor"
566−version = "0.28.0"
566+version = "0.28.1"
567567source = "registry+https://github.com/rust-lang/crates.io-index"
568−checksum = "948a5f9e43559d16faf583694f1c742eb401ce24ce8e6f2238caedea7486433c"
568+checksum = "2eadca029ef716b4378f7afb19f7ee101fde9e58ba1f1445971315ac866db417"
569569dependencies = [
570570 "bstr",
571571 "btoi",
572572 "gix-date",
573573 "itoa",
574574 "thiserror",
575− "winnow 0.5.17",
575+ "winnow 0.5.28",
576576]
577577
578578[[package]]
579579name = "gix-chunk"
580−version = "0.4.4"
580+version = "0.4.5"
581581source = "registry+https://github.com/rust-lang/crates.io-index"
582−checksum = "5b42ea64420f7994000130328f3c7a2038f639120518870436d31b8bde704493"
582+checksum = "d411ecd9b558b0c20b3252b7e409eec48eabc41d18324954fe526bac6e2db55f"
583583dependencies = [
584584 "thiserror",
585585]
586586
587587[[package]]
588588name = "gix-commitgraph"
589−version = "0.22.0"
589+version = "0.22.1"
590590source = "registry+https://github.com/rust-lang/crates.io-index"
591−checksum = "7e8bc78b1a6328fa6d8b3a53b6c73997af37fd6bfc1d6c49f149e63bda5cbb36"
591+checksum = "85a7007ba021f059803afaf6f8a48872422abc20550ac12ede6ddea2936cec36"
592592dependencies = [
593593 "bstr",
594594 "gix-chunk",
595595 "gix-features",
596596 "gix-hash",
597− "memmap2 0.7.1",
597+ "memmap2",
598598 "thiserror",
599599]
600600
601601[[package]]
602602name = "gix-config"
603−version = "0.31.0"
603+version = "0.32.1"
604604source = "registry+https://github.com/rust-lang/crates.io-index"
605−checksum = "5cae98c6b4c66c09379bc35274b172587d6b0ac369a416c39128ad8c6454f9bb"
605+checksum = "0341471d55d8676e98b88e121d7065dfa4c9c5acea4b6d6ecdd2846e85cce0c3"
606606dependencies = [
607607 "bstr",
608608 "gix-config-value",
@@ -616,14 +616,14 @@ dependencies = [
616616 "smallvec",
617617 "thiserror",
618618 "unicode-bom",
619− "winnow 0.5.17",
619+ "winnow 0.5.28",
620620]
621621
622622[[package]]
623623name = "gix-config-value"
624−version = "0.14.0"
624+version = "0.14.1"
625625source = "registry+https://github.com/rust-lang/crates.io-index"
626−checksum = "ea7505b97f4d8e7933e29735a568ba2f86d8de466669d9f0e8321384f9972f47"
626+checksum = "6419db582ea84dfb58c7e7b0af7fd62c808aa14954af2936a33f89b0f4ed018e"
627627dependencies = [
628628 "bitflags 2.4.1",
629629 "bstr",
@@ -634,9 +634,9 @@ dependencies = [
634634
635635[[package]]
636636name = "gix-date"
637−version = "0.8.0"
637+version = "0.8.1"
638638source = "registry+https://github.com/rust-lang/crates.io-index"
639−checksum = "fc7df669639582dc7c02737642f76890b03b5544e141caba68a7d6b4eb551e0d"
639+checksum = "468dfbe411f335f01525a1352271727f8e7772075a93fa747260f502086b30be"
640640dependencies = [
641641 "bstr",
642642 "itoa",
@@ -646,10 +646,11 @@ dependencies = [
646646
647647[[package]]
648648name = "gix-diff"
649−version = "0.37.0"
649+version = "0.38.0"
650650source = "registry+https://github.com/rust-lang/crates.io-index"
651−checksum = "931394f69fb8c9ed6afc0aae3487bd869e936339bcc13ed8884472af072e0554"
651+checksum = "8119a985887cfe68f4bdf92e51bd64bc758a73882d82fcfc03ebcb164441c85d"
652652dependencies = [
653+ "bstr",
653654 "gix-hash",
654655 "gix-object",
655656 "thiserror",
@@ -657,9 +658,9 @@ dependencies = [
657658
658659[[package]]
659660name = "gix-discover"
660−version = "0.26.0"
661+version = "0.27.0"
661662source = "registry+https://github.com/rust-lang/crates.io-index"
662−checksum = "a45d5cf0321178883e38705ab2b098f625d609a7d4c391b33ac952eff2c490f2"
663+checksum = "6fad89416ebe0b3b7df78464124e2a02417b6cd3743d48ad93df86f4d2929c07"
663664dependencies = [
664665 "bstr",
665666 "dunce",
@@ -672,9 +673,9 @@ dependencies = [
672673
673674[[package]]
674675name = "gix-features"
675−version = "0.36.0"
676+version = "0.36.1"
676677source = "registry+https://github.com/rust-lang/crates.io-index"
677−checksum = "51f4365ba17c4f218d7fd9ec102b8d2d3cb0ca200a835e81151ace7778aec827"
678+checksum = "4d46a4a5c6bb5bebec9c0d18b65ada20e6517dbd7cf855b87dd4bbdce3a771b2"
678679dependencies = [
679680 "crc32fast",
680681 "flate2",
@@ -690,18 +691,18 @@ dependencies = [
690691
691692[[package]]
692693name = "gix-fs"
693−version = "0.8.0"
694+version = "0.8.1"
694695source = "registry+https://github.com/rust-lang/crates.io-index"
695−checksum = "8cd171c0cae97cd0dc57e7b4601cb1ebf596450e263ef3c02be9107272c877bd"
696+checksum = "20e86eb040f5776a5ade092282e51cdcad398adb77d948b88d17583c2ae4e107"
696697dependencies = [
697698 "gix-features",
698699]
699700
700701[[package]]
701702name = "gix-glob"
702−version = "0.14.0"
703+version = "0.14.1"
703704source = "registry+https://github.com/rust-lang/crates.io-index"
704−checksum = "8fac08925dbc14d414bd02eb45ffb4cecd912d1fce3883f867bd0103c192d3e4"
705+checksum = "5db19298c5eeea2961e5b3bf190767a2d1f09b8802aeb5f258e42276350aff19"
705706dependencies = [
706707 "bitflags 2.4.1",
707708 "bstr",
@@ -711,9 +712,9 @@ dependencies = [
711712
712713[[package]]
713714name = "gix-hash"
714−version = "0.13.1"
715+version = "0.13.3"
715716source = "registry+https://github.com/rust-lang/crates.io-index"
716−checksum = "1884c7b41ea0875217c1be9ce91322f90bde433e91d374d0e1276073a51ccc60"
717+checksum = "1f8cf8c2266f63e582b7eb206799b63aa5fa68ee510ad349f637dfe2d0653de0"
717718dependencies = [
718719 "faster-hex",
719720 "thiserror",
@@ -721,9 +722,9 @@ dependencies = [
721722
722723[[package]]
723724name = "gix-hashtable"
724−version = "0.4.0"
725+version = "0.4.1"
725726source = "registry+https://github.com/rust-lang/crates.io-index"
726−checksum = "409268480841ad008e81c17ca5a293393fbf9f2b6c2f85b8ab9de1f0c5176a16"
727+checksum = "feb61880816d7ec4f0b20606b498147d480860ddd9133ba542628df2f548d3ca"
727728dependencies = [
728729 "gix-hash",
729730 "hashbrown 0.14.3",
@@ -743,9 +744,9 @@ dependencies = [
743744
744745[[package]]
745746name = "gix-macros"
746−version = "0.1.0"
747+version = "0.1.1"
747748source = "registry+https://github.com/rust-lang/crates.io-index"
748−checksum = "9d8acb5ee668d55f0f2d19a320a3f9ef67a6999ad483e11135abcc2464ed18b6"
749+checksum = "02a5bcaf6704d9354a3071cede7e77d366a5980c7352e102e2c2f9b645b1d3ae"
749750dependencies = [
750751 "proc-macro2",
751752 "quote",
@@ -754,9 +755,9 @@ dependencies = [
754755
755756[[package]]
756757name = "gix-object"
757−version = "0.38.0"
758+version = "0.39.0"
758759source = "registry+https://github.com/rust-lang/crates.io-index"
759−checksum = "740f2a44267f58770a1cb3a3d01d14e67b089c7136c48d4bddbb3cfd2bf86a51"
760+checksum = "febf79c5825720c1c63fe974c7bbe695d0cb54aabad73f45671c60ce0e501e33"
760761dependencies = [
761762 "bstr",
762763 "btoi",
@@ -768,14 +769,14 @@ dependencies = [
768769 "itoa",
769770 "smallvec",
770771 "thiserror",
771− "winnow 0.5.17",
772+ "winnow 0.5.28",
772773]
773774
774775[[package]]
775776name = "gix-odb"
776−version = "0.54.0"
777+version = "0.55.0"
777778source = "registry+https://github.com/rust-lang/crates.io-index"
778−checksum = "8630b56cb80d8fa684d383dad006a66401ee8314e12fbf0e566ddad8c115143b"
779+checksum = "1fae5f971540c99c6ecc8d4368ecc9d18a9dc8b9391025c68c4399747dc93bac"
779780dependencies = [
780781 "arc-swap",
781782 "gix-date",
@@ -792,9 +793,9 @@ dependencies = [
792793
793794[[package]]
794795name = "gix-pack"
795−version = "0.44.0"
796+version = "0.45.0"
796797source = "registry+https://github.com/rust-lang/crates.io-index"
797−checksum = "1431ba2e30deff1405920693d54ab231c88d7c240dd6ccc936ee223d8f8697c3"
798+checksum = "4569491c92446fddf373456ff360aff9a9effd627b40a70f2d7914dcd75a3205"
798799dependencies = [
799800 "clru",
800801 "gix-chunk",
@@ -804,7 +805,7 @@ dependencies = [
804805 "gix-object",
805806 "gix-path",
806807 "gix-tempfile",
807− "memmap2 0.7.1",
808+ "memmap2",
808809 "parking_lot",
809810 "smallvec",
810811 "thiserror",
@@ -812,9 +813,9 @@ dependencies = [
812813
813814[[package]]
814815name = "gix-path"
815−version = "0.10.0"
816+version = "0.10.1"
816817source = "registry+https://github.com/rust-lang/crates.io-index"
817−checksum = "6a1d370115171e3ae03c5c6d4f7d096f2981a40ddccb98dfd704c773530ba73b"
818+checksum = "d86d6fac2fabe07b67b7835f46d07571f68b11aa1aaecae94fe722ea4ef305e1"
818819dependencies = [
819820 "bstr",
820821 "gix-trace",
@@ -825,9 +826,9 @@ dependencies = [
825826
826827[[package]]
827828name = "gix-quote"
828−version = "0.4.7"
829+version = "0.4.8"
829830source = "registry+https://github.com/rust-lang/crates.io-index"
830−checksum = "475c86a97dd0127ba4465fbb239abac9ea10e68301470c9791a6dd5351cdc905"
831+checksum = "4f84845efa535468bc79c5a87b9d29219f1da0313c8ecf0365a5daa7e72786f2"
831832dependencies = [
832833 "bstr",
833834 "btoi",
@@ -836,9 +837,9 @@ dependencies = [
836837
837838[[package]]
838839name = "gix-ref"
839−version = "0.38.0"
840+version = "0.39.0"
840841source = "registry+https://github.com/rust-lang/crates.io-index"
841−checksum = "0ec2f6d07ac88d2fb8007ee3fa3e801856fb9d82e7366ec0ca332eb2c9d74a52"
842+checksum = "1ac23ed741583c792f573c028785db683496a6dfcd672ec701ee54ba6a77e1ff"
842843dependencies = [
843844 "gix-actor",
844845 "gix-date",
@@ -850,16 +851,16 @@ dependencies = [
850851 "gix-path",
851852 "gix-tempfile",
852853 "gix-validate",
853− "memmap2 0.7.1",
854+ "memmap2",
854855 "thiserror",
855− "winnow 0.5.17",
856+ "winnow 0.5.28",
856857]
857858
858859[[package]]
859860name = "gix-refspec"
860−version = "0.19.0"
861+version = "0.20.0"
861862source = "registry+https://github.com/rust-lang/crates.io-index"
862−checksum = "ccb0974cc41dbdb43a180c7f67aa481e1c1e160fcfa8f4a55291fd1126c1a6e7"
863+checksum = "76d9d3b82e1ee78fc0dc1c37ea5ea76c2dbc73f407db155f0dfcea285e583bee"
863864dependencies = [
864865 "bstr",
865866 "gix-hash",
@@ -871,9 +872,9 @@ dependencies = [
871872
872873[[package]]
873874name = "gix-revision"
874−version = "0.23.0"
875+version = "0.24.0"
875876source = "registry+https://github.com/rust-lang/crates.io-index"
876−checksum = "2ca97ac73459a7f3766aa4a5638a6e37d56d4c7962bc1986fbaf4883d0772588"
877+checksum = "fe5dd51710ce5434bc315ea30394fab483c5377276494edd79222b321a5a9544"
877878dependencies = [
878879 "bstr",
879880 "gix-date",
@@ -887,9 +888,9 @@ dependencies = [
887888
888889[[package]]
889890name = "gix-revwalk"
890−version = "0.9.0"
891+version = "0.10.0"
891892source = "registry+https://github.com/rust-lang/crates.io-index"
892−checksum = "a16d8c892e4cd676d86f0265bf9d40cefd73d8d94f86b213b8b77d50e77efae0"
893+checksum = "69d4ed2493ca94a475fdf147138e1ef8bab3b6ebb56abf3d9bda1c05372ec1dd"
893894dependencies = [
894895 "gix-commitgraph",
895896 "gix-date",
@@ -902,9 +903,9 @@ dependencies = [
902903
903904[[package]]
904905name = "gix-sec"
905−version = "0.10.0"
906+version = "0.10.1"
906907source = "registry+https://github.com/rust-lang/crates.io-index"
907−checksum = "92b9542ac025a8c02ed5d17b3fc031a111a384e859d0be3532ec4d58c40a0f28"
908+checksum = "a36ea2c5907d64a9b4b5d3cc9f430e6c30f0509646b5e38eb275ca57c5bf29e2"
908909dependencies = [
909910 "bitflags 2.4.1",
910911 "gix-path",
@@ -927,15 +928,15 @@ dependencies = [
927928
928929[[package]]
929930name = "gix-trace"
930−version = "0.1.3"
931+version = "0.1.4"
931932source = "registry+https://github.com/rust-lang/crates.io-index"
932−checksum = "96b6d623a1152c3facb79067d6e2ecdae48130030cf27d6eb21109f13bd7b836"
933+checksum = "b686a35799b53a9825575ca3f06481d0a053a409c4d97ffcf5ddd67a8760b497"
933934
934935[[package]]
935936name = "gix-traverse"
936−version = "0.34.0"
937+version = "0.35.0"
937938source = "registry+https://github.com/rust-lang/crates.io-index"
938−checksum = "14d050ec7d4e1bb76abf0636cf4104fb915b70e54e3ced9a4427c999100ff38a"
939+checksum = "df2112088122a0206592c84fbd42020db63b2ccaed66a0293779f2e5fbf80474"
939940dependencies = [
940941 "gix-commitgraph",
941942 "gix-date",
@@ -949,9 +950,9 @@ dependencies = [
949950
950951[[package]]
951952name = "gix-url"
952−version = "0.25.1"
953+version = "0.25.2"
953954source = "registry+https://github.com/rust-lang/crates.io-index"
954−checksum = "b1b9ac8ed32ad45f9fc6c5f8c0be2ed911e544a5a19afd62d95d524ebaa95671"
955+checksum = "0c427a1a11ccfa53a4a2da47d9442c2241deee63a154bc15cc14b8312fbc4005"
955956dependencies = [
956957 "bstr",
957958 "gix-features",
@@ -963,18 +964,18 @@ dependencies = [
963964
964965[[package]]
965966name = "gix-utils"
966−version = "0.1.5"
967+version = "0.1.6"
967968source = "registry+https://github.com/rust-lang/crates.io-index"
968−checksum = "b85d89dc728613e26e0ed952a19583744e7f5240fcd4aa30d6c824ffd8b52f0f"
969+checksum = "9f82c41937f00e15a1f6cb0b55307f0ca1f77f4407ff2bf440be35aa688c6a3e"
969970dependencies = [
970971 "fastrand",
971972]
972973
973974[[package]]
974975name = "gix-validate"
975−version = "0.8.0"
976+version = "0.8.1"
976977source = "registry+https://github.com/rust-lang/crates.io-index"
977−checksum = "e05cab2b03a45b866156e052aa38619f4ece4adcb2f79978bfc249bc3b21b8c5"
978+checksum = "75b7d8e4274be69f284bbc7e6bb2ccf7065dbcdeba22d8c549f2451ae426883f"
978979dependencies = [
979980 "bstr",
980981 "thiserror",
@@ -1027,7 +1028,7 @@ dependencies = [
10271028 "grep-matcher",
10281029 "log",
10291030 "memchr",
1030− "memmap2 0.9.0",
1031+ "memmap2",
10311032]
10321033
10331034[[package]]
@@ -1450,15 +1451,6 @@ version = "2.6.3"
14501451source = "registry+https://github.com/rust-lang/crates.io-index"
14511452checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c"
14521453
1453−[[package]]
1454−name = "memmap2"
1455−version = "0.7.1"
1456−source = "registry+https://github.com/rust-lang/crates.io-index"
1457−checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6"
1458−dependencies = [
1459− "libc",
1460−]
1461−
14621454[[package]]
14631455name = "memmap2"
14641456version = "0.9.0"
@@ -2601,9 +2593,9 @@ dependencies = [
26012593
26022594[[package]]
26032595name = "winnow"
2604−version = "0.5.17"
2596+version = "0.5.28"
26052597source = "registry+https://github.com/rust-lang/crates.io-index"
2606−checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c"
2598+checksum = "6c830786f7720c2fd27a1a0e27a709dbd3c4d009b56d098fc742d4f4eab91fe2"
26072599dependencies = [
26082600 "memchr",
26092601]
helix-vcs/Cargo.toml+1−1
@@ -19,7 +19,7 @@ tokio = { version = "1", features = ["rt", "rt-multi-thread", "time", "sync", "p
1919parking_lot = "0.12"
2020arc-swap = { version = "1.6.0" }
2121
22−gix = { version = "0.55.0", default-features = false , optional = true }
22+gix = { version = "0.56.0", default-features = false , optional = true }
2323imara-diff = "0.1.5"
2424anyhow = "1"
2525
helix-vcs/src/git.rs+4−4
@@ -3,7 +3,7 @@ use arc_swap::ArcSwap;
33use std::path::Path;
44use std::sync::Arc;
55
6−use gix::objs::tree::EntryMode;
6+use gix::objs::tree::EntryKind;
77use gix::sec::trust::DefaultForLevel;
88use gix::{Commit, ObjectId, Repository, ThreadSafeRepository};
99
@@ -128,12 +128,12 @@ fn find_file_in_commit(repo: &Repository, commit: &Commit, file: &Path) -> Resul
128128 let tree_entry = tree
129129 .lookup_entry_by_path(rel_path, &mut Vec::new())?
130130 .context("file is untracked")?;
131− match tree_entry.mode() {
131+ match tree_entry.mode().kind() {
132132 // not a file, everything is new, do not show diff
133− mode @ (EntryMode::Tree | EntryMode::Commit | EntryMode::Link) => {
133+ mode @ (EntryKind::Tree | EntryKind::Commit | EntryKind::Link) => {
134134 bail!("entry at {} is not a file but a {mode:?}", file.display())
135135 }
136136 // found a file
137− EntryMode::Blob | EntryMode::BlobExecutable => Ok(tree_entry.object_id()),
137+ EntryKind::Blob | EntryKind::BlobExecutable => Ok(tree_entry.object_id()),
138138 }
139139}