Merge branch 'maintenance'

Author: Byron

.gitattributes

@@ -1,4 +1,4 @@
-**/generated-archives/*.tar.xz filter=lfs diff=lfs merge=lfs -text
+**/generated-archives/*.tar.xz diff=lfs merge=lfs -text
 
 # assure line feeds don't interfere with our working copy hash 
 **/tests/fixtures/*.sh text crlf=input	eol=lf

.github/workflows/ci.yml

@@ -12,7 +12,6 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - uses: Swatinem/rust-cache@v2
-    - run: git lfs fetch && git lfs checkout
     - name: tests
       run: make test
     - name: docs

Cargo.toml

@@ -37,7 +37,7 @@ http-reqwest = ["gix/blocking-http-transport-reqwest-rust-tls"]
 
 
 [dependencies]
-gix = { version = "0.55.2", default-features = false, features = ["blocking-network-client", "blob-diff", "revision"] }
+gix = { version = "0.57.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"] }

Makefile

@@ -11,5 +11,5 @@ baseline-atomic: ## run very slow tests that single-step through all commits
 
 test: ## run all tests with cargo
 	RUST_BACKTRACE=1 cargo test --test crates-index-diff
-	GITOXIDE_PACK_CACHE_MEMORY=1g RUST_BACKTRACE=1 cargo test --test baseline --release --features max-performance
+	GIX_PACK_CACHE_MEMORY=1g RUST_BACKTRACE=1 cargo test --test baseline --release --features max-performance
 

src/index/diff/delegate.rs

@@ -21,9 +21,9 @@ impl Delegate {
     ) -> Result<gix::object::tree::diff::Action, Error> {
         use gix::bstr::ByteSlice;
         use gix::object::tree::diff::change::Event::*;
-        use gix::objs::tree::EntryMode::*;
+        use gix::objs::tree::EntryKind::*;
         fn entry_data(
-            entry: gix::objs::tree::EntryMode,
+            entry: gix::objs::tree::EntryKind,
             id: gix::Id<'_>,
         ) -> Result<Option<gix::Object<'_>>, Error> {
             matches!(entry, Blob | BlobExecutable)
@@ -40,7 +40,7 @@ impl Delegate {
                 unreachable!("BUG: this is disabled so shouldn't happen")
             }
             Addition { entry_mode, id } => {
-                if let Some(obj) = entry_data(entry_mode, id)? {
+                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 change = if version.yanked {
@@ -65,11 +65,18 @@ impl Delegate {
                     });
                 }
             }
-            Modification { .. } => {
-                if let Some(diff) = change.event.diff().transpose()? {
+            Modification {
+                entry_mode,
+                previous_id,
+                id,
+                ..
+            } => {
+                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;
-                    for (number, line) in diff.old.data.lines().enumerate() {
+                    for (number, line) in old.data.lines().enumerate() {
                         old_lines.insert(Line(number, line));
                     }
 
@@ -79,7 +86,7 @@ impl Delegate {
                     let mut new_versions = RawTable::with_capacity(old_lines.len().min(1024));
                     let hasher = RandomState::new();
 
-                    for (number, line) in diff.new.data.lines().enumerate() {
+                    for (number, line) in new.data.lines().enumerate() {
                         // first quickly check if the exact same line is already present in this file in that case we don't need to do anything else
                         if old_lines.remove(&Line(number, line)) {
                             continue;

src/index/diff/mod.rs

@@ -1,4 +1,5 @@
 use crate::{Change, Index};
+use bstr::ByteSlice;
 use gix::prelude::ObjectIdExt;
 use std::sync::atomic::AtomicBool;
 
@@ -32,7 +33,7 @@ pub enum Error {
     #[error("Failed to parse rev-spec to determine which revisions to diff")]
     RevParse(#[from] gix::revision::spec::parse::Error),
     #[error(transparent)]
-    DiffRewrites(#[from] gix::object::tree::diff::rewrites::Error),
+    DiffRewrites(#[from] gix::diff::new_rewrites::Error),
     #[error("Couldn't find blob that showed up when diffing trees")]
     FindObject(#[from] gix::object::find::existing::Error),
     #[error("Couldn't get the tree of a commit for diffing purposes")]
@@ -127,7 +128,7 @@ impl Index {
                 .remote_name
                 .as_deref()
                 .and_then(|name| {
-                    self.repo.find_remote(name).ok().or_else(|| {
+                    self.repo.find_remote(name.as_bstr()).ok().or_else(|| {
                         self.repo
                             .head()
                             .ok()
@@ -162,7 +163,11 @@ impl Index {
             if remote.refspecs(gix::remote::Direction::Fetch).is_empty() {
                 let spec = format!(
                     "+refs/heads/{branch}:refs/remotes/{remote}/{branch}",
-                    remote = self.remote_name.as_deref().unwrap_or("origin"),
+                    remote = self
+                        .remote_name
+                        .as_ref()
+                        .map(|n| n.as_bstr())
+                        .unwrap_or("origin".into()),
                     branch = self.branch_name,
                 );
                 remote

src/index/init.rs

@@ -1,5 +1,6 @@
 use crate::index::{CloneOptions, LAST_SEEN_REFNAME};
 use crate::Index;
+use std::borrow::Cow;
 use std::path::Path;
 use std::sync::atomic::AtomicBool;
 
@@ -61,11 +62,7 @@ impl Index {
         };
 
         repo.object_cache_size_if_unset(4 * 1024 * 1024);
-        let remote_name = repo
-            .remote_names()
-            .into_iter()
-            .next()
-            .map(ToOwned::to_owned);
+        let remote_name = repo.remote_names().into_iter().next().map(Cow::into_owned);
         Ok(Index {
             repo,
             remote_name,

src/types.rs

@@ -1,5 +1,6 @@
 use std::collections::HashMap;
 
+use bstr::BString;
 use smartstring::alias::String as SmolString;
 use std::hash::Hash;
 use std::{fmt, slice};
@@ -13,7 +14,7 @@ pub struct Index {
     pub branch_name: &'static str,
     /// The name of the symbolic name of the remote to fetch from.
     /// If `None`, obtain the remote name from the configuration of the currently checked-out branch.
-    pub remote_name: Option<String>,
+    pub remote_name: Option<BString>,
     /// The git repository to use for diffing
     pub(crate) repo: gix::Repository,
 }