Source: hx Version: 25.07.1+20260624+ds+~0.3.3+ds+~0.4.0+20260607+ds-4 Severity: important Tags: patch User: [email protected] Usertags: gix-0.86 X-Debbugs-Cc: [email protected]
Dear maintainer, I am preparing a rust-gix transition to 0.86, which will likely be uploaded in the coming days. hx depends on gix 0.83, so it needs a dependency bump and a small port. I have attached a debdiff fixing this. Best regards, Simon Quigley [email protected]
diff -Nru hx-25.07.1+20260624+ds+~0.3.3+ds+~0.4.0+20260607+ds/debian/changelog hx-25.07.1+20260624+ds+~0.3.3+ds+~0.4.0+20260607+ds/debian/changelog --- hx-25.07.1+20260624+ds+~0.3.3+ds+~0.4.0+20260607+ds/debian/changelog 2026-07-03 03:56:50.000000000 -0500 +++ hx-25.07.1+20260624+ds+~0.3.3+ds+~0.4.0+20260607+ds/debian/changelog 2026-08-20 11:25:55.000000000 -0500 @@ -1,3 +1,10 @@ +hx (25.07.1+20260624+ds+~0.3.3+ds+~0.4.0+20260607+ds-4.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Relax gix to 0.86 via 2002_newer_gix.patch, removing the old patch. + + -- Simon Quigley <[email protected]> Thu, 20 Aug 2026 11:25:55 -0500 + hx (25.07.1+20260624+ds+~0.3.3+ds+~0.4.0+20260607+ds-4) unstable; urgency=medium * no-changes source-only upload to enable testing migration diff -Nru hx-25.07.1+20260624+ds+~0.3.3+ds+~0.4.0+20260607+ds/debian/patches/2002_newer_gix.patch hx-25.07.1+20260624+ds+~0.3.3+ds+~0.4.0+20260607+ds/debian/patches/2002_newer_gix.patch --- hx-25.07.1+20260624+ds+~0.3.3+ds+~0.4.0+20260607+ds/debian/patches/2002_newer_gix.patch 1969-12-31 18:00:00.000000000 -0600 +++ hx-25.07.1+20260624+ds+~0.3.3+ds+~0.4.0+20260607+ds/debian/patches/2002_newer_gix.patch 2026-08-20 11:25:55.000000000 -0500 @@ -0,0 +1,37 @@ +Description: Relax gix to 0.86 +Author: Simon Quigley <[email protected]> +Origin: vendor +Forwarded: no +Last-Update: 2026-08-20 +--- +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 @@ tokio = { version = "1", features = ["rt + parking_lot.workspace = true + arc-swap.workspace = true + +-gix = { version = "0.84.0", features = ["attributes", "status", "max-performance", "sha1"], default-features = false, optional = true } ++gix = { version = "0.86.0", features = ["attributes", "status", "max-performance", "sha1"], default-features = false, optional = true } + imara-diff = "0.1.8" + anyhow = "1" + +--- a/helix-vcs/src/git.rs ++++ b/helix-vcs/src/git.rs +@@ -1,6 +1,6 @@ + use anyhow::{bail, Context, Result}; + use arc_swap::ArcSwap; +-use gix::filter::plumbing::driver::apply::Delay; ++use gix::filter::plumbing::{driver::apply::Delay, pipeline::convert::to_worktree::Options}; + use std::io::Read; + use std::path::Path; + use std::sync::Arc; +@@ -56,7 +56,7 @@ pub fn get_diff_base(file: &Path, trust_ + let rela_path = gix::path::try_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)?; ++ pipeline.convert_to_worktree(&data, rela_path.as_ref(), Options { can_delay: Delay::Forbid, ..Default::default() })?; + let mut buf = Vec::with_capacity(data.len()); + worktree_outcome.read_to_end(&mut buf)?; + Ok(buf) diff -Nru hx-25.07.1+20260624+ds+~0.3.3+ds+~0.4.0+20260607+ds/debian/patches/2002_older_gix.patch hx-25.07.1+20260624+ds+~0.3.3+ds+~0.4.0+20260607+ds/debian/patches/2002_older_gix.patch --- hx-25.07.1+20260624+ds+~0.3.3+ds+~0.4.0+20260607+ds/debian/patches/2002_older_gix.patch 2026-06-14 17:31:54.000000000 -0500 +++ hx-25.07.1+20260624+ds+~0.3.3+ds+~0.4.0+20260607+ds/debian/patches/2002_older_gix.patch 1969-12-31 18:00:00.000000000 -0600 @@ -1,19 +0,0 @@ -Description: accept older minor version of crate gix -Author: Jonas Smedegaard <[email protected]> -Author: Junyong Liang <[email protected]> -Bug-Debian: https://bugs.debian.org/1116062 -Forwarded: not-needed -Last-Update: 2026-06-15 ---- -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 @@ - parking_lot.workspace = true - arc-swap.workspace = true - --gix = { version = "0.84.0", features = ["attributes", "status", "max-performance", "sha1"], default-features = false, optional = true } -+gix = { version = ">= 0.83.0, <= 0.84", features = ["attributes", "status", "max-performance", "sha1"], default-features = false, optional = true } - imara-diff = "0.2.0" - anyhow = "1" - diff -Nru hx-25.07.1+20260624+ds+~0.3.3+ds+~0.4.0+20260607+ds/debian/patches/2002_older_imara-diff.patch hx-25.07.1+20260624+ds+~0.3.3+ds+~0.4.0+20260607+ds/debian/patches/2002_older_imara-diff.patch --- hx-25.07.1+20260624+ds+~0.3.3+ds+~0.4.0+20260607+ds/debian/patches/2002_older_imara-diff.patch 2026-06-14 17:15:34.000000000 -0500 +++ hx-25.07.1+20260624+ds+~0.3.3+ds+~0.4.0+20260607+ds/debian/patches/2002_older_imara-diff.patch 2026-08-20 11:25:55.000000000 -0500 @@ -19,10 +19,10 @@ chrono = { version = "0.4", default-features = false, features = ["alloc", "std"] } --- a/helix-vcs/Cargo.toml +++ b/helix-vcs/Cargo.toml -@@ -18,7 +18,7 @@ +@@ -18,7 +18,7 @@ parking_lot.workspace = true arc-swap.workspace = true - gix = { version = ">= 0.83.0, <= 0.84", features = ["attributes", "status", "max-performance", "sha1"], default-features = false, optional = true } + gix = { version = "0.84.0", features = ["attributes", "status", "max-performance", "sha1"], default-features = false, optional = true } -imara-diff = "0.2.0" +imara-diff = "0.1.8" anyhow = "1" diff -Nru hx-25.07.1+20260624+ds+~0.3.3+ds+~0.4.0+20260607+ds/debian/patches/series hx-25.07.1+20260624+ds+~0.3.3+ds+~0.4.0+20260607+ds/debian/patches/series --- hx-25.07.1+20260624+ds+~0.3.3+ds+~0.4.0+20260607+ds/debian/patches/series 2026-06-24 09:53:30.000000000 -0500 +++ hx-25.07.1+20260624+ds+~0.3.3+ds+~0.4.0+20260607+ds/debian/patches/series 2026-08-20 11:25:55.000000000 -0500 @@ -10,13 +10,13 @@ 2002_older_chardetng.patch 2002_older_dashmap.patch 2002_older_etcetera.patch -2002_older_gix.patch 2002_older_hashbrown.patch 2002_older_imara-diff.patch 2002_older_open.patch 2002_older_regex-automata.patch 2002_older_signal-hook.patch 2002_older_signal-hook-tokio.patch +2002_newer_gix.patch 2003_avoid_sonic_rs.patch 2004_perl.patch 2005_deb-built-using.patch
OpenPGP_signature.asc
Description: OpenPGP digital signature
