Merge branch 'upgrade-gix'

Author: Byron

Cargo.toml

@@ -34,7 +34,7 @@ http-reqwest = ["gix/blocking-http-transport-reqwest-rust-tls"]
 
 
 [dependencies]
-gix = { version = "0.63.0", default-features = false, features = ["blocking-network-client", "blob-diff", "revision"] }
+gix = { version = "0.67.0", default-features = false, features = ["blocking-network-client", "blob-diff", "revision"] }
 serde = { version = "1", features = ["std", "derive"] }
 hex = { version = "0.4.3", features = ["serde"] }
 smartstring = { version = "1.0.1", features = ["serde"] }

src/index/diff/delegate.rs

@@ -20,7 +20,7 @@ impl Delegate {
         change: gix::object::tree::diff::Change<'_, '_, '_>,
     ) -> Result<gix::object::tree::diff::Action, Error> {
         use gix::bstr::ByteSlice;
-        use gix::object::tree::diff::change::Event::*;
+        use gix::object::tree::diff::Change::*;
         use gix::objs::tree::EntryKind::*;
         fn entry_data(
             entry: gix::objs::tree::EntryKind,
@@ -31,18 +31,23 @@ impl Delegate {
                 .transpose()
                 .map_err(Into::into)
         }
-        if change.location.contains(&b'.') {
+        if change.location().contains(&b'.') {
             return Ok(Default::default());
         }
 
-        match change.event {
+        match change {
             Rewrite { .. } => {
                 unreachable!("BUG: this is disabled so shouldn't happen")
             }
-            Addition { entry_mode, id } => {
+            Addition {
+                entry_mode,
+                id,
+                location,
+                ..
+            } => {
                 if let Some(obj) = entry_data(entry_mode.kind(), id)? {
                     for line in obj.data.lines() {
-                        let version = version_from_json_line(line, change.location)?;
+                        let version = version_from_json_line(line, location)?;
                         let change = if version.yanked {
                             Change::AddedAndYanked(version)
                         } else {
@@ -52,15 +57,20 @@ impl Delegate {
                     }
                 }
             }
-            Deletion { entry_mode, id, .. } => {
+            Deletion {
+                entry_mode,
+                id,
+                location,
+                ..
+            } => {
                 if entry_mode.is_no_tree() {
                     let obj = id.object()?;
                     let mut deleted = Vec::with_capacity(obj.data.lines().count());
                     for line in obj.data.lines() {
-                        deleted.push(version_from_json_line(line, change.location)?);
+                        deleted.push(version_from_json_line(line, location)?);
                     }
                     self.changes.push(Change::CrateDeleted {
-                        name: change.location.to_string(),
+                        name: location.to_string(),
                         versions: deleted,
                     });
                 }
@@ -69,13 +79,14 @@ impl Delegate {
                 entry_mode,
                 previous_id,
                 id,
+                location,
                 ..
             } => {
                 if entry_mode.is_blob() {
                     let old = previous_id.object()?.into_blob();
                     let new = id.object()?.into_blob();
                     let mut old_lines = AHashSet::with_capacity(1024);
-                    let location = change.location;
+                    let location = location;
                     for (number, line) in old.data.lines().enumerate() {
                         old_lines.insert(Line(number, line));
                     }

src/index/diff/mod.rs

@@ -1,6 +1,7 @@
 use crate::{Change, Index};
 use bstr::ByteSlice;
 use gix::prelude::ObjectIdExt;
+use gix::traverse::commit::simple::CommitTimeOrder;
 use std::sync::atomic::AtomicBool;
 
 mod delegate;
@@ -41,7 +42,7 @@ pub enum Error {
     #[error("Couldn't get the tree of a commit for diffing purposes")]
     PeelToTree(#[from] gix::object::peel::to_kind::Error),
     #[error("Failed to diff two trees to find changed crates")]
-    Diff(#[from] gix::object::blob::diff::init::Error),
+    Diff(#[from] gix::diff::options::init::Error),
     #[error(transparent)]
     DiffForEach(#[from] gix::object::tree::diff::for_each::Error),
     #[error("Failed to decode {line:?} in file {file_name:?} as crate version")]
@@ -62,7 +63,8 @@ pub enum Error {
     Fetch(#[from] gix::remote::fetch::Error),
     #[error(transparent)]
     InitAnonymousRemote(#[from] gix::remote::init::Error),
-    #[error("Could not find local tracking branch for remote branch {name:?} in any of {} fetched refs", mappings.len())]
+    #[error("Could not find local tracking branch for remote branch {name:?} in any of {} fetched refs", mappings.len()
+    )]
     NoMatchingBranch {
         name: String,
         mappings: Vec<gix::remote::fetch::Mapping>,
@@ -253,8 +255,9 @@ impl Index {
         let to = into_tree(to.into())?;
         let mut delegate = Delegate::default();
         from.changes()?
-            .track_filename()
-            .track_rewrites(None)
+            .options(|opts| {
+                opts.track_rewrites(None).track_filename();
+            })
             .for_each_to_obtain_tree(&to, |change| delegate.handle(change))?;
         delegate.into_result()
     }
@@ -321,11 +324,10 @@ impl Index {
         let mut commits = current_commit
             .attach(&self.repo)
             .ancestors()
-            .sorting(
-                gix::traverse::commit::simple::Sorting::ByCommitTimeNewestFirstCutoffOlderThan {
-                    seconds,
-                },
-            )
+            .sorting(gix::revision::walk::Sorting::ByCommitTimeCutoff {
+                seconds,
+                order: CommitTimeOrder::NewestFirst,
+            })
             .first_parent_only()
             .all()
             .ok()?

tests/index/mod.rs

@@ -119,15 +119,15 @@ fn changes_since_last_fetch() {
         let mut config = index.repository_mut().config_snapshot_mut();
         // TODO: use `remote.save_as_to()` here, requires a way to get the mutable repo ref again.
         config
-            .set_raw_value(
+            .set_raw_value_by(
                 "remote",
                 Some(repo_name.into()),
                 "url",
                 git_dir.to_str().unwrap(),
             )
             .unwrap();
         config
-            .set_raw_value(
+            .set_raw_value_by(
                 "remote",
                 Some(repo_name.into()),
                 "fetch",