mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-29 23:57:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

annotate: impl Debug on AnnotateResults type, use BString for readability

Browse source 
I'm going to add snapshot tests. Debug isn't strictly needed, but it should
help printf debugging.
This commit is contained in:
Yuya Nishihara 2024-10-26 17:35:13 +09:00
parent 8cdb0e4d6e
commit f6db2426e8
1 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib/src/annotate.rs
View file

@ -20,6 +20,7 @@
use std::collections::HashMap;
use bstr::BString;
use pollster::FutureExt;
use crate::backend::BackendError;
@ -42,13 +43,14 @@ use crate::revset::RevsetFilterPredicate;
use crate::store::Store;
/// Annotation results for a specific file
#[derive(Clone, Debug)]
pub struct AnnotateResults {
/// An array of annotation results ordered by line.
/// For each value in the array, the commit_id is the commit id of the
/// originator of the line and the string is the actual line itself (without
/// newline terminators). The vector is ordered by appearance in the
/// file
pub file_annotations: Vec<(CommitId, Vec<u8>)>,
pub file_annotations: Vec<(CommitId, BString)>,
}
/// A map from commits to line mappings.
@ -93,19 +95,12 @@ fn convert_to_results(
original_line_map: OriginalLineMap,
original_contents: &[u8],
) -> AnnotateResults {
let result_lines = original_contents
let file_annotations = original_contents
.split_inclusive(|b| *b == b'\n')
.enumerate()
.map(|(idx, line)| {
(
original_line_map.get(&idx).unwrap().clone(),
line.to_owned(),
)
})
.map(|(idx, line)| (original_line_map.get(&idx).unwrap().clone(), line.into()))
.collect();
AnnotateResults {
file_annotations: result_lines,
}
AnnotateResults { file_annotations }
}
/// loads a given file into the cache under a specific commit id.