Source: hx Version: 25.07.1+20260723+ds+~0.3.3+ds+~0.4.0+20260627+ds-2.2 Severity: important Tags: patch User: [email protected] Usertags: gix-0.89 X-Debbugs-Cc: [email protected]
Dear maintainer, I am preparing a gix transition to 0.89, which will likely be uploaded soon. hx build-depends on librust-gix-dev (>= 0.87), librust-gix-dev (<< 0.88), so 0.89 is rejected. I have attached a debdiff fixing this. Best regards, Simon Quigley [email protected]
diff -Nru hx-25.07.1+20260723+ds+~0.3.3+ds+~0.4.0+20260627+ds/debian/changelog hx-25.07.1+20260723+ds+~0.3.3+ds+~0.4.0+20260627+ds/debian/changelog --- hx-25.07.1+20260723+ds+~0.3.3+ds+~0.4.0+20260627+ds/debian/changelog 2026-10-02 20:55:00.000000000 -0500 +++ hx-25.07.1+20260723+ds+~0.3.3+ds+~0.4.0+20260627+ds/debian/changelog 2026-10-09 21:59:39.000000000 -0500 @@ -1,3 +1,10 @@ +hx (25.07.1+20260723+ds+~0.3.3+ds+~0.4.0+20260627+ds-2.3) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Build against gix 0.89. + + -- Simon Quigley <[email protected]> Fri, 09 Oct 2026 21:59:39 -0500 + hx (25.07.1+20260723+ds+~0.3.3+ds+~0.4.0+20260627+ds-2.2) unstable; urgency=medium * Non-maintainer upload (Closes: #1149779). diff -Nru hx-25.07.1+20260723+ds+~0.3.3+ds+~0.4.0+20260627+ds/debian/control hx-25.07.1+20260723+ds+~0.3.3+ds+~0.4.0+20260627+ds/debian/control --- hx-25.07.1+20260723+ds+~0.3.3+ds+~0.4.0+20260627+ds/debian/control 2026-09-26 14:56:58.000000000 -0500 +++ hx-25.07.1+20260723+ds+~0.3.3+ds+~0.4.0+20260627+ds/debian/control 2026-10-09 21:59:34.000000000 -0500 @@ -23,8 +23,8 @@ librust-futures-executor-0.3-dev, librust-futures-util-0.3-dev, librust-fuzzy-matcher-0.3-dev, - librust-gix-dev (>= 0.87), - librust-gix-dev (<< 0.88), + librust-gix-dev (>= 0.89), + librust-gix-dev (<< 0.90), librust-globset-0.4-dev, librust-grep-matcher-0.1-dev, librust-grep-regex-0.1-dev, diff -Nru hx-25.07.1+20260723+ds+~0.3.3+ds+~0.4.0+20260627+ds/debian/patches/1002_newer_gix.patch hx-25.07.1+20260723+ds+~0.3.3+ds+~0.4.0+20260627+ds/debian/patches/1002_newer_gix.patch --- hx-25.07.1+20260723+ds+~0.3.3+ds+~0.4.0+20260627+ds/debian/patches/1002_newer_gix.patch 2026-09-26 14:56:58.000000000 -0500 +++ hx-25.07.1+20260723+ds+~0.3.3+ds+~0.4.0+20260627+ds/debian/patches/1002_newer_gix.patch 2026-10-09 21:59:39.000000000 -0500 @@ -1,17 +1,17 @@ Description: use newer minor version of crate gix Author: Simon Quigley <[email protected]> Bug-Debian: https://bugs.debian.org/1144938 -Last-Update: 2026-08-25 +Last-Update: 2026-10-10 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/helix-vcs/Cargo.toml +++ b/helix-vcs/Cargo.toml -@@ -17,7 +17,7 @@ +@@ -17,7 +17,7 @@ tokio = { version = "1", features = ["rt parking_lot.workspace = true arc-swap.workspace = true -gix = { version = "0.85.0", features = ["attributes", "status", "max-performance", "sha1"], default-features = false, optional = true } -+gix = { version = "0.87.1", features = ["attributes", "status", "max-performance", "sha1"], default-features = false, optional = true } ++gix = { version = "0.89.0", features = ["attributes", "status", "max-performance", "sha1"], default-features = false, optional = true } imara-diff = "0.2.0" anyhow = "1" @@ -25,8 +25,12 @@ use std::io::Read; use std::path::Path; use std::sync::Arc; -@@ -56,7 +56,7 @@ - let rela_path = gix::path::try_into_bstr(rela_path)?; +@@ -53,10 +53,10 @@ pub fn get_diff_base(file: &Path, trust_ + // trust level instead of letting gix re-derive it from `.git` ownership; see the note there. + if let Some(work_dir) = repo.workdir() { + let rela_path = file.strip_prefix(work_dir)?; +- let rela_path = gix::path::try_into_bstr(rela_path)?; ++ let rela_path = gix::path::into_bstr(rela_path)?; let (mut pipeline, _) = repo.filter_pipeline(None)?; let mut worktree_outcome = - pipeline.convert_to_worktree(&data, rela_path.as_ref(), Delay::Forbid)?;
OpenPGP_signature.asc
Description: OpenPGP digital signature
