Skip to content

Update to imara-diff 0.2 in diff slider test #2288

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cruessler wants to merge 2 commits into
base: main
Choose a base branch
from
+108 −5
Open

Update to imara-diff 0.2 in diff slider test #2288

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
618c37a
Update to `imara-diff` 0.2 in diff slider test
cruessler Dec 8, 2025
c0be918
Re-add slider test v1 to compare both versions
cruessler Dec 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 15 additions & 75 deletions gix-diff/tests/diff/blob/slider.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
use gix_diff::blob::intern::TokenSource;
use gix_diff::blob::unified_diff::ContextSize;
use gix_diff::blob::{Algorithm, UnifiedDiff};
use gix_diff::blob::v2::{Algorithm, BasicLineDiffPrinter, Diff, InternedInput, UnifiedDiffConfig};
Copy link
Member

@Byron Byron Dec 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's interesting that v2 is available at all as it shouldn't be available by default.
Let me fix that

Copy link
Member

@Byron Byron Dec 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, seems like this code should not compile, it's fine on main.

Copy link
Member

@Byron Byron Dec 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry about that, I didn't realise that this is a test in gix-diff-tests, which enables the feature. It was a long day yesterday 😅.

Copy link
Contributor Author

@cruessler cruessler Dec 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No worries, I also could have provided that context. :-)

use gix_object::bstr::ByteSlice;
use gix_testtools::bstr::{BString, ByteVec};
use pretty_assertions::StrComparison;

Expand Down Expand Up @@ -39,37 +38,23 @@ fn baseline() -> gix_testtools::Result {
let old_data = std::fs::read(asset_dir.join(format!("{old_blob_id}.blob")))?;
let new_data = std::fs::read(asset_dir.join(format!("{new_blob_id}.blob")))?;

let interner = gix_diff::blob::intern::InternedInput::new(
tokens_for_diffing(old_data.as_slice()),
tokens_for_diffing(new_data.as_slice()),
);

let actual = gix_diff::blob::diff(
algorithm,
&interner,
UnifiedDiff::new(
&interner,
baseline::DiffHunkRecorder::new(),
ContextSize::symmetrical(3),
),
)?;
let input = InternedInput::new(old_data.to_str().unwrap(), new_data.to_str().unwrap());

let mut diff = Diff::compute(algorithm, &input);
diff.postprocess_lines(&input);

let actual = diff
.unified_diff(
&BasicLineDiffPrinter(&input.interner),
UnifiedDiffConfig::default(),
&input,
)
.to_string();

let baseline_path = worktree_path.join(&file_name);
let baseline = std::fs::read(baseline_path)?;
let baseline = baseline::Baseline::new(&baseline);

let actual = actual
.iter()
.fold(BString::default(), |mut acc, diff_hunk| {
acc.push_str(diff_hunk.header.to_string().as_str());
acc.push(b'\n');

acc.extend_from_slice(&diff_hunk.lines);

acc
})
.to_string();

let baseline = baseline
.fold(BString::default(), |mut acc, diff_hunk| {
acc.push_str(diff_hunk.header.to_string().as_str());
Expand Down Expand Up @@ -119,15 +104,11 @@ fn baseline() -> gix_testtools::Result {
Ok(())
}

fn tokens_for_diffing(data: &[u8]) -> impl TokenSource<Token = &[u8]> {
gix_diff::blob::sources::byte_lines(data)
}

mod baseline {
use gix_object::bstr::ByteSlice;
use std::iter::Peekable;

use gix_diff::blob::unified_diff::{ConsumeHunk, HunkHeader};
use gix_diff::blob::unified_diff::HunkHeader;
use gix_object::bstr::{self, BString};

static START_OF_HEADER: &[u8; 4] = b"@@ -";
Expand All @@ -138,47 +119,6 @@ mod baseline {
pub lines: BString,
}

pub struct DiffHunkRecorder {
inner: Vec<DiffHunk>,
}

impl DiffHunkRecorder {
pub fn new() -> Self {
Self { inner: Vec::new() }
}
}

impl ConsumeHunk for DiffHunkRecorder {
type Out = Vec<DiffHunk>;

fn consume_hunk(
&mut self,
header: HunkHeader,
lines: &[(gix_diff::blob::unified_diff::DiffLineKind, &[u8])],
) -> std::io::Result<()> {
let mut buf = Vec::new();

for &(kind, line) in lines {
buf.push(kind.to_prefix() as u8);
buf.extend_from_slice(line);
buf.push(b'\n');
}

let diff_hunk = DiffHunk {
header,
lines: buf.into(),
};

self.inner.push(diff_hunk);

Ok(())
}

fn finish(self) -> Self::Out {
self.inner
}
}

type Lines<'a> = Peekable<bstr::Lines<'a>>;

pub struct Baseline<'a> {
Expand Down
Loading