From 49dffa7d24a6a8f08444b9f10b9f6398100f9d1f Mon Sep 17 00:00:00 2001 From: dependabot[bot] Date: Wed, 13 Dec 2023 02:29:43 +0100 Subject: 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] * 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] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Michael Davis --- helix-vcs/Cargo.toml | 2 +- helix-vcs/src/git.rs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'helix-vcs') diff --git a/helix-vcs/Cargo.toml b/helix-vcs/Cargo.toml index ba38160f..bdf4b54d 100644 --- a/helix-vcs/Cargo.toml +++ b/helix-vcs/Cargo.toml @@ -19,7 +19,7 @@ tokio = { version = "1", features = ["rt", "rt-multi-thread", "time", "sync", "p parking_lot = "0.12" arc-swap = { version = "1.6.0" } -gix = { version = "0.55.0", default-features = false , optional = true } +gix = { version = "0.56.0", default-features = false , optional = true } imara-diff = "0.1.5" anyhow = "1" diff --git a/helix-vcs/src/git.rs b/helix-vcs/src/git.rs index 88dba70c..e4d45301 100644 --- a/helix-vcs/src/git.rs +++ b/helix-vcs/src/git.rs @@ -3,7 +3,7 @@ use arc_swap::ArcSwap; use std::path::Path; use std::sync::Arc; -use gix::objs::tree::EntryMode; +use gix::objs::tree::EntryKind; use gix::sec::trust::DefaultForLevel; use gix::{Commit, ObjectId, Repository, ThreadSafeRepository}; @@ -128,12 +128,12 @@ fn find_file_in_commit(repo: &Repository, commit: &Commit, file: &Path) -> Resul let tree_entry = tree .lookup_entry_by_path(rel_path, &mut Vec::new())? .context("file is untracked")?; - match tree_entry.mode() { + match tree_entry.mode().kind() { // not a file, everything is new, do not show diff - mode @ (EntryMode::Tree | EntryMode::Commit | EntryMode::Link) => { + mode @ (EntryKind::Tree | EntryKind::Commit | EntryKind::Link) => { bail!("entry at {} is not a file but a {mode:?}", file.display()) } // found a file - EntryMode::Blob | EntryMode::BlobExecutable => Ok(tree_entry.object_id()), + EntryKind::Blob | EntryKind::BlobExecutable => Ok(tree_entry.object_id()), } } -- cgit v1.2.3-70-g09d2