mirrors/helix
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2025-04-03 19:07:44 +03:00
Code Issues Projects Releases Packages Wiki Activity

build(deps): bump gix from 0.55.2 to 0.56.0 (#9055)

Browse source 
* 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>
This commit is contained in:
dependabot[bot] 2023-12-13 02:29:43 +01:00 • committed by GitHub
parent f036451a0e
commit 49dffa7d24
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 78 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

2
helix-vcs/Cargo.toml
View file

@ -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"

8
helix-vcs/src/git.rs
View file

@ -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()),
}
}