cybercyst/jj
1
0
Fork 0
mirror of https://github.com/martinvonz/jj.git synced 2025-05-05 23:42:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

annotate: reorganize initialization of state to make process restartable

Browse Source
This commit is contained in:
Yuya Nishihara 2025-04-15 16:52:00 +09:00
parent 4a8074759c
commit 5feed28f49
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
lib/src/annotate.rs
View File

@ -207,46 +207,45 @@ fn compute_file_annotation(
) -> Result<FileAnnotation, RevsetEvaluationError> { ) -> Result<FileAnnotation, RevsetEvaluationError> {
source.fill_line_map(); source.fill_line_map();
let text = source.text.clone(); let text = source.text.clone();
let line_map = process_commits(repo, starting_commit_id, source, domain, file_path)?; let mut state = AnnotationState {
original_line_map: vec![Err(starting_commit_id.clone()); source.line_map.len()],
commit_source_map: HashMap::from([(starting_commit_id.clone(), source)]),
num_unresolved_roots: 0,
};
process_commits(repo, &mut state, domain, file_path)?;
let line_map = state.original_line_map;
Ok(FileAnnotation { line_map, text }) Ok(FileAnnotation { line_map, text })
} }
/// Starting at the starting commit, compute changes at that commit relative to /// Starting from the source commits, compute changes at that commit relative to
/// it's direct parents, updating the mappings as we go. We return the final /// its direct parents, updating the mappings as we go.
/// original line map that represents where each line of the original came from.
fn process_commits( fn process_commits(
repo: &dyn Repo, repo: &dyn Repo,
starting_commit_id: &CommitId, state: &mut AnnotationState,
starting_source: Source,
domain: &Rc<ResolvedRevsetExpression>, domain: &Rc<ResolvedRevsetExpression>,
file_name: &RepoPath, file_name: &RepoPath,
) -> Result<OriginalLineMap, RevsetEvaluationError> { ) -> Result<(), RevsetEvaluationError> {
let predicate = RevsetFilterPredicate::File(FilesetExpression::file_path(file_name.to_owned())); let predicate = RevsetFilterPredicate::File(FilesetExpression::file_path(file_name.to_owned()));
// TODO: If the domain isn't a contiguous range, changes masked out by it // TODO: If the domain isn't a contiguous range, changes masked out by it
// might not be caught by the closest ancestor revision. For example, // might not be caught by the closest ancestor revision. For example,
// domain=merges() would pick up almost nothing because merge revisions // domain=merges() would pick up almost nothing because merge revisions
// are usually empty. Perhaps, we want to query `files(file_path, // are usually empty. Perhaps, we want to query `files(file_path,
// within_sub_graph=domain)`, not `domain & files(file_path)`. // within_sub_graph=domain)`, not `domain & files(file_path)`.
let ancestors = RevsetExpression::commit(starting_commit_id.clone()).ancestors(); let heads = RevsetExpression::commits(state.commit_source_map.keys().cloned().collect());
let revset = RevsetExpression::commit(starting_commit_id.clone()) let revset = heads
.union(&domain.intersection(&ancestors).filtered(predicate)) .union(&domain.intersection(&heads.ancestors()).filtered(predicate))
.evaluate(repo)?; .evaluate(repo)?;
let mut state = AnnotationState { state.num_unresolved_roots = 0;
original_line_map: vec![Err(starting_commit_id.clone()); starting_source.line_map.len()],
commit_source_map: HashMap::from([(starting_commit_id.clone(), starting_source)]),
num_unresolved_roots: 0,
};
for node in revset.iter_graph() { for node in revset.iter_graph() {
let (commit_id, edge_list) = node?; let (commit_id, edge_list) = node?;
process_commit(repo, file_name, &mut state, &commit_id, &edge_list)?; process_commit(repo, file_name, state, &commit_id, &edge_list)?;
if state.commit_source_map.len() == state.num_unresolved_roots { if state.commit_source_map.len() == state.num_unresolved_roots {
// No more lines to propagate to ancestors. // No more lines to propagate to ancestors.
break; break;
} }
} }
Ok(state.original_line_map) Ok(())
} }
/// For a given commit, for each parent, we compare the version in the parent /// For a given commit, for each parent, we compare the version in the parent