Skip to content

Commit 3d1abaf

Browse files
committed
Rename lines_to_blame to hunks_to_blame
1 parent 85a9a9b commit 3d1abaf

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

gix-blame/src/lib.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -770,7 +770,7 @@ pub fn blame_file<E>(
770770
// TODO Verify that `imara-diff` tokenizes lines the same way `lines` does.
771771
let number_of_lines = std::fs::read_to_string(absolute_path).unwrap().lines().count();
772772

773-
let mut lines_to_blame: Vec<UnblamedHunk> = vec![UnblamedHunk::new(
773+
let mut hunks_to_blame: Vec<UnblamedHunk> = vec![UnblamedHunk::new(
774774
0..number_of_lines.try_into().unwrap(),
775775
Offset::Added(0),
776776
)];
@@ -787,7 +787,7 @@ pub fn blame_file<E>(
787787
// remaining lines to it, even though we don’t explicitly check whether that is true
788788
// here. We could perhaps use `needed_to_obtain` to compare `suspect` against an empty
789789
// tree to validate this assumption.
790-
out.extend(lines_to_blame.iter().map(|hunk| {
790+
out.extend(hunks_to_blame.iter().map(|hunk| {
791791
BlameEntry::new(
792792
hunk.range_in_blamed_file.clone(),
793793
// TODO
@@ -798,7 +798,7 @@ pub fn blame_file<E>(
798798
)
799799
}));
800800

801-
lines_to_blame = vec![];
801+
hunks_to_blame = vec![];
802802

803803
break;
804804
}
@@ -820,7 +820,7 @@ pub fn blame_file<E>(
820820
gix_diff::tree::recorder::Change::Addition { .. } => {
821821
// Every line that has not been blamed yet on a commit, is expected to have been
822822
// added when the file was added to the repository.
823-
out.extend(lines_to_blame.iter().map(|hunk| {
823+
out.extend(hunks_to_blame.iter().map(|hunk| {
824824
BlameEntry::new(
825825
hunk.range_in_blamed_file.clone(),
826826
// TODO
@@ -831,20 +831,20 @@ pub fn blame_file<E>(
831831
)
832832
}));
833833

834-
lines_to_blame = vec![];
834+
hunks_to_blame = vec![];
835835

836836
break;
837837
}
838838
gix_diff::tree::recorder::Change::Deletion { .. } => todo!(),
839839
gix_diff::tree::recorder::Change::Modification { previous_oid, oid, .. } => {
840840
let changes = get_changes(&odb, resource_cache, *oid, *previous_oid, file_path);
841841

842-
lines_to_blame = process_changes(&mut out, &lines_to_blame, &changes, suspect);
842+
hunks_to_blame = process_changes(&mut out, &hunks_to_blame, &changes, suspect);
843843
}
844844
}
845845
}
846846

847-
assert_eq!(lines_to_blame, vec![]);
847+
assert_eq!(hunks_to_blame, vec![]);
848848

849849
// I don’t know yet whether it would make sense to use a data structure instead that preserves
850850
// order on insertion.

0 commit comments

Comments
 (0)