Skip to content

Commit 633cba7

Browse files
committed
refactor
1 parent afb87d9 commit 633cba7

File tree

8 files changed

+24
-12
lines changed

8 files changed

+24
-12
lines changed

git-diff/tests/tree/mod.rs renamed to git-diff/tests/visit/mod.rs

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
mod with_tree {
2+
use crate::hex_to_id;
3+
use git_diff::visit::recorder;
24
use git_odb::{pack, Locate};
5+
36
const FIRST_COMMIT: &str = "055df97e18cd537da3cb16bcbdf1733fdcdfb430";
47

5-
fn diff_at(commit_id: &str) -> crate::Result {
8+
fn diff_at(commit_id: &str) -> crate::Result<recorder::Changes> {
69
let db = git_odb::linked::Db::at(
710
test_tools::scripted_fixture_repo_read_only("make_diff_repo.sh")?
811
.join(".git")
@@ -41,18 +44,27 @@ mod with_tree {
4144
.and_then(|tree| tree.into_tree())
4245
};
4346

47+
let mut recorder = git_diff::visit::Recorder::default();
4448
git_diff::visit::Changes::from(previous_tree.as_ref()).to_obtain_tree(
4549
&main_tree,
4650
&mut git_diff::visit::State::default(),
4751
|_oid, _buf| todo!("Actual lookup in db"),
48-
&mut git_diff::visit::Recorder::default(),
52+
&mut recorder,
4953
)?;
50-
Ok(())
54+
Ok(recorder.records)
5155
}
5256
#[test]
5357
#[should_panic]
5458
fn file_added() {
55-
diff_at(FIRST_COMMIT).unwrap();
59+
// :000000 100644 0000000000000000000000000000000000000000 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 A f
60+
assert_eq!(
61+
diff_at(FIRST_COMMIT).unwrap(),
62+
vec![recorder::Change::Addition {
63+
mode: git_object::tree::Mode::Tree,
64+
oid: hex_to_id("e69de29bb2d1d6434b8b29ae775ad8c2e48c5391"),
65+
path: "f".into()
66+
}]
67+
);
5668
todo!("detect an added file in the root tree")
5769
}
5870
}

git-object/tests/borrowed/commit.rs renamed to git-object/tests/immutable/commit.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
mod method {
2-
use crate::{borrowed::fixture_bytes, hex_to_id};
2+
use crate::{hex_to_id, immutable::fixture_bytes};
33
use git_object::immutable::Commit;
44
use pretty_assertions::assert_eq;
55

@@ -14,8 +14,8 @@ mod method {
1414
}
1515

1616
mod from_bytes {
17-
use crate::borrowed::linus_signature;
18-
use crate::{borrowed::fixture_bytes, borrowed::signature};
17+
use crate::immutable::linus_signature;
18+
use crate::{immutable::fixture_bytes, immutable::signature};
1919
use git_object::{bstr::ByteSlice, immutable::Commit};
2020
use smallvec::SmallVec;
2121

File renamed without changes.

git-object/tests/borrowed/tag.rs renamed to git-object/tests/immutable/tag.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use git_object::{
55
};
66

77
mod method {
8-
use crate::{borrowed::fixture_bytes, hex_to_id};
8+
use crate::{hex_to_id, immutable::fixture_bytes};
99
use git_object::immutable::Tag;
1010
use pretty_assertions::assert_eq;
1111

@@ -20,7 +20,7 @@ mod method {
2020
}
2121

2222
mod from_bytes {
23-
use crate::{borrowed::fixture_bytes, borrowed::signature, borrowed::tag::tag_fixture};
23+
use crate::{immutable::fixture_bytes, immutable::signature, immutable::tag::tag_fixture};
2424
use git_object::{bstr::ByteSlice, immutable::Tag, Kind};
2525

2626
#[test]

git-object/tests/borrowed/tree.rs renamed to git-object/tests/immutable/tree.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
mod from_bytes {
2-
use crate::borrowed::fixture_bytes;
2+
use crate::immutable::fixture_bytes;
33
use git_object::{
44
bstr::ByteSlice,
55
immutable::{tree::Entry, Tree},
File renamed without changes.
File renamed without changes.

git-object/tests/object.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::path::PathBuf;
22

3-
mod borrowed;
4-
mod owned;
3+
mod immutable;
4+
mod mutable;
55

66
#[cfg(not(windows))]
77
fn fixup(v: Vec<u8>) -> Vec<u8> {

0 commit comments

Comments
 (0)