-
-
Notifications
You must be signed in to change notification settings - Fork 385
[WIP] Add script to generate tests cases for gix-diff
#2197
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.
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
Draft
cruessler
wants to merge
11
commits into
GitoxideLabs:main
Choose a base branch
from
cruessler:add-tests-for-slider-problem
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+409
−1
Draft
Changes from 8 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
f27ecaf
Add create-diff-cases
cruessler bc6bef2
Add DiffHunkRecorder
cruessler 3b89374
Add Baseline for parsing git diff baseline
cruessler 99a6bb6
Add assertion
cruessler f0ceafa
Thanks clippy
cruessler 6eaafda
Use `git diff --no-index` to create baseline
cruessler 653a353
Use textual diff in test
cruessler 41cfdba
Parse hunk header without regex
cruessler 20c7288
Enable `set -eu -o pipefail`
cruessler 28f9fe8
Replace .commit by .blob
cruessler 1060c4c
Use unified diff in test
cruessler File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,4 @@ | ||
pub(crate) mod pipeline; | ||
mod platform; | ||
mod slider; | ||
mod unified_diff; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,228 @@ | ||
use std::{iter::Peekable, path::PathBuf}; | ||
|
||
use gix_diff::blob::{ | ||
intern::TokenSource, | ||
unified_diff::{ConsumeHunk, ContextSize, HunkHeader}, | ||
Algorithm, UnifiedDiff, | ||
}; | ||
use gix_object::bstr::{self, BString}; | ||
|
||
#[derive(Debug, PartialEq)] | ||
struct DiffHunk { | ||
header: HunkHeader, | ||
lines: BString, | ||
} | ||
|
||
struct DiffHunkRecorder { | ||
inner: Vec<DiffHunk>, | ||
} | ||
|
||
impl DiffHunkRecorder { | ||
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 | ||
} | ||
} | ||
|
||
struct Baseline<'a> { | ||
lines: Peekable<bstr::Lines<'a>>, | ||
} | ||
|
||
mod baseline { | ||
use std::path::Path; | ||
|
||
use gix_diff::blob::unified_diff::HunkHeader; | ||
use gix_object::bstr::ByteSlice; | ||
|
||
use super::{Baseline, DiffHunk}; | ||
|
||
static START_OF_HEADER: &[u8; 4] = b"@@ -"; | ||
|
||
impl Baseline<'_> { | ||
pub fn collect(baseline_path: impl AsRef<Path>) -> std::io::Result<Vec<DiffHunk>> { | ||
let content = std::fs::read(baseline_path)?; | ||
|
||
let mut baseline = Baseline { | ||
lines: content.lines().peekable(), | ||
}; | ||
|
||
baseline.skip_header(); | ||
|
||
Ok(baseline.collect()) | ||
} | ||
|
||
fn skip_header(&mut self) { | ||
// diff --git a/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa b/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb | ||
// index ccccccc..ddddddd 100644 | ||
// --- a/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | ||
// +++ b/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb | ||
|
||
let line = self.lines.next().expect("line to be present"); | ||
assert!(line.starts_with(b"diff --git ")); | ||
|
||
let line = self.lines.next().expect("line to be present"); | ||
assert!(line.starts_with(b"index ")); | ||
|
||
let line = self.lines.next().expect("line to be present"); | ||
assert!(line.starts_with(b"--- ")); | ||
|
||
let line = self.lines.next().expect("line to be present"); | ||
assert!(line.starts_with(b"+++ ")); | ||
} | ||
|
||
/// Parse diff hunk headers that conform to the unified diff hunk header format. | ||
/// | ||
/// The parser is very primitive and relies on the fact that `+18` is parsed as `18`. This | ||
/// allows us to split the input on ` ` and `,` only. | ||
/// | ||
/// @@ -18,6 +18,7 @@ abc def ghi | ||
/// @@ -{before_hunk_start},{before_hunk_len} +{after_hunk_start},{after_hunk_len} @@ | ||
fn parse_hunk_header(&self, line: &[u8]) -> gix_testtools::Result<HunkHeader> { | ||
let Some(line) = line.strip_prefix(START_OF_HEADER) else { | ||
todo!() | ||
}; | ||
|
||
let parts: Vec<_> = line.split(|b| *b == b' ' || *b == b',').collect(); | ||
let [before_hunk_start, before_hunk_len, after_hunk_start, after_hunk_len, ..] = parts[..] else { | ||
todo!() | ||
}; | ||
|
||
Ok(HunkHeader { | ||
before_hunk_start: self.parse_number(before_hunk_start), | ||
before_hunk_len: self.parse_number(before_hunk_len), | ||
after_hunk_start: self.parse_number(after_hunk_start), | ||
after_hunk_len: self.parse_number(after_hunk_len), | ||
}) | ||
} | ||
|
||
fn parse_number(&self, bytes: &[u8]) -> u32 { | ||
bytes | ||
.to_str() | ||
.expect("to be a valid UTF-8 string") | ||
.parse::<u32>() | ||
.expect("to be a number") | ||
} | ||
} | ||
|
||
impl Iterator for Baseline<'_> { | ||
type Item = DiffHunk; | ||
|
||
fn next(&mut self) -> Option<Self::Item> { | ||
let mut hunk_header = None; | ||
let mut hunk_lines = Vec::new(); | ||
|
||
while let Some(line) = self.lines.next() { | ||
if line.starts_with(START_OF_HEADER) { | ||
assert!(hunk_header.is_none(), "should not overwrite existing hunk_header"); | ||
hunk_header = self.parse_hunk_header(line).ok(); | ||
|
||
continue; | ||
} | ||
|
||
match line[0] { | ||
b' ' | b'+' | b'-' => { | ||
hunk_lines.extend_from_slice(line); | ||
hunk_lines.push(b'\n'); | ||
} | ||
_ => todo!(), | ||
} | ||
|
||
match self.lines.peek() { | ||
Some(next_line) if next_line.starts_with(START_OF_HEADER) => break, | ||
None => break, | ||
_ => {} | ||
} | ||
} | ||
|
||
hunk_header.map(|hunk_header| DiffHunk { | ||
header: hunk_header, | ||
lines: hunk_lines.into(), | ||
}) | ||
} | ||
} | ||
} | ||
|
||
#[test] | ||
fn sliders() -> gix_testtools::Result { | ||
let worktree_path = fixture_path()?; | ||
let asset_dir = worktree_path.join("assets"); | ||
let git_dir = worktree_path.join(".git"); | ||
|
||
let dir = std::fs::read_dir(&git_dir)?; | ||
|
||
for entry in dir { | ||
let entry = entry?; | ||
let file_name = entry.file_name().into_string().expect("to be string"); | ||
|
||
if !file_name.ends_with(".baseline") { | ||
continue; | ||
} | ||
|
||
let parts: Vec<_> = file_name.split(".").collect(); | ||
let name = parts[0]; | ||
|
||
let parts: Vec<_> = name.split("-").collect(); | ||
let [old_blob_id, new_blob_id] = parts[..] else { | ||
unimplemented!(); | ||
}; | ||
|
||
let old_data = std::fs::read(asset_dir.join(format!("{old_blob_id}.commit")))?; | ||
let new_data = std::fs::read(asset_dir.join(format!("{new_blob_id}.commit")))?; | ||
|
||
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::Myers, | ||
&interner, | ||
UnifiedDiff::new(&interner, DiffHunkRecorder::new(), ContextSize::symmetrical(3)), | ||
)?; | ||
|
||
let baseline_path = git_dir.join(file_name); | ||
let baseline = Baseline::collect(baseline_path).unwrap(); | ||
|
||
pretty_assertions::assert_eq!(actual, baseline); | ||
} | ||
|
||
Ok(()) | ||
} | ||
|
||
fn tokens_for_diffing(data: &[u8]) -> impl TokenSource<Token = &[u8]> { | ||
gix_diff::blob::sources::byte_lines(data) | ||
} | ||
|
||
fn fixture_path() -> gix_testtools::Result<PathBuf> { | ||
gix_testtools::scripted_fixture_read_only_standalone("make_diff_for_sliders_repo.sh") | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,129 @@ | ||
pub(super) mod function { | ||
use anyhow::Context; | ||
use std::{ | ||
collections::HashSet, | ||
path::{Path, PathBuf}, | ||
}; | ||
|
||
use gix::{ | ||
bstr::{BString, ByteSlice}, | ||
objs::FindExt, | ||
}; | ||
|
||
pub fn create_diff_cases( | ||
sliders_file: PathBuf, | ||
worktree_dir: &Path, | ||
destination_dir: PathBuf, | ||
count: usize, | ||
asset_dir: Option<BString>, | ||
) -> anyhow::Result<()> { | ||
// TODO: turn into parameter. | ||
let dry_run = false; | ||
|
||
let prefix = if dry_run { "WOULD" } else { "Will" }; | ||
let sliders = std::fs::read_to_string(&sliders_file)?; | ||
|
||
eprintln!( | ||
"read {} which has {} lines", | ||
sliders_file.display(), | ||
sliders.lines().count() | ||
); | ||
|
||
let sliders: HashSet<_> = sliders | ||
.lines() | ||
.take(count) | ||
.map(|line| { | ||
let parts: Vec<_> = line.split_ascii_whitespace().collect(); | ||
|
||
match parts[..] { | ||
[before, after, ..] => (before, after), | ||
_ => todo!(), | ||
} | ||
}) | ||
.collect(); | ||
|
||
eprintln!("{sliders:?}"); | ||
|
||
let repo = gix::open(worktree_dir)?; | ||
|
||
let asset_dir = asset_dir.unwrap_or("assets".into()); | ||
let assets = destination_dir.join(asset_dir.to_os_str()?); | ||
|
||
eprintln!("{prefix} create directory '{assets}'", assets = assets.display()); | ||
if !dry_run { | ||
std::fs::create_dir_all(&assets)?; | ||
} | ||
|
||
let mut buf = Vec::new(); | ||
|
||
let script_name = "make_diff_for_sliders_repo.sh"; | ||
|
||
let mut blocks: Vec<String> = vec![format!( | ||
r#"#!/usr/bin/env bash | ||
# TODO: | ||
# `git diff --no-index` returns 1 when there's differences, but 1 is treated as an error by the | ||
# shell. | ||
# set -eu -o pipefail | ||
ROOT="$(cd "$(dirname "${{BASH_SOURCE[0]}}")" && pwd)" | ||
git init | ||
echo .gitignore >> .gitignore | ||
echo {asset_dir}/ >> .gitignore | ||
echo {script_name} >> .gitignore | ||
mkdir -p {asset_dir} | ||
"# | ||
)]; | ||
|
||
for (before, after) in sliders.iter() { | ||
let revspec = repo.rev_parse(*before)?; | ||
let old_blob_id = revspec | ||
.single() | ||
.context(format!("rev-spec '{before}' must resolve to a single object"))?; | ||
let (old_path, _) = revspec | ||
.path_and_mode() | ||
.context(format!("rev-spec '{before}' must contain a path"))?; | ||
|
||
let revspec = repo.rev_parse(*after)?; | ||
let new_blob_id = revspec | ||
.single() | ||
.context(format!("rev-spec '{after}' must resolve to a single object"))?; | ||
let (new_path, _) = revspec | ||
.path_and_mode() | ||
.context(format!("rev-spec '{after}' must contain a path"))?; | ||
|
||
eprintln!("{old_blob_id:?} {old_path:?} {new_blob_id:?} {new_path:?}"); | ||
|
||
let dst_old_blob = assets.join(format!("{old_blob_id}.commit")); | ||
let dst_new_blob = assets.join(format!("{new_blob_id}.commit")); | ||
if !dry_run { | ||
let old_blob = repo.objects.find_blob(&old_blob_id, &mut buf)?.data; | ||
std::fs::write(dst_old_blob, old_blob)?; | ||
|
||
let new_blob = repo.objects.find_blob(&new_blob_id, &mut buf)?.data; | ||
std::fs::write(dst_new_blob, new_blob)?; | ||
} | ||
|
||
blocks.push(format!( | ||
r#"git diff --no-index "$ROOT/{asset_dir}/{old_blob_id}.commit" "$ROOT/{asset_dir}/{new_blob_id}.commit" > .git/{old_blob_id}-{new_blob_id}.baseline | ||
cp "$ROOT/{asset_dir}/{old_blob_id}.commit" assets/ | ||
cruessler marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
cp "$ROOT/{asset_dir}/{new_blob_id}.commit" assets/ | ||
"# | ||
)); | ||
} | ||
|
||
let script_file = destination_dir.join(script_name); | ||
eprintln!( | ||
"{prefix} write script file at '{script_file}'", | ||
script_file = script_file.display() | ||
); | ||
|
||
if !dry_run { | ||
let script = blocks.join("\n"); | ||
std::fs::write(script_file, script)?; | ||
} | ||
|
||
Ok(()) | ||
} | ||
} |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.