mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-10-24 07:32:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

rewrite: extract new_parents() that doesn't ignore divergent entries

Browse source 
I'll use this in debug assertion. The extracted function is not named as
new_parents_with() because it's not really about parents.
This commit is contained in:
Yuya Nishihara 2024-08-31 11:00:14 +09:00
parent cc15ecf7c7
commit 780692c2f1
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lib/src/repo.rs
View file

@ -990,6 +990,14 @@ impl MutableRepo {
/// If `parent_mapping` contains cycles, this function may either panic or
/// drop parents that caused cycles.
pub fn new_parents(&self, old_ids: &[CommitId]) -> Vec<CommitId> {
self.rewritten_ids_with(old_ids, |rewrite| !matches!(rewrite, Rewrite::Divergent(_)))
}
fn rewritten_ids_with(
&self,
old_ids: &[CommitId],
mut predicate: impl FnMut(&Rewrite) -> bool,
) -> Vec<CommitId> {
assert!(!old_ids.is_empty());
let mut new_ids = Vec::with_capacity(old_ids.len());
let mut to_visit = old_ids.iter().rev().collect_vec();
@ -998,14 +1006,12 @@ impl MutableRepo {
if !visited.insert(id) {
continue;
}
match self.parent_mapping.get(id) {
None | Some(Rewrite::Divergent(_)) => {
match self.parent_mapping.get(id).filter(|&v| predicate(v)) {
None => {
new_ids.push(id.clone());
}
Some(Rewrite::Rewritten(replacement)) => {
to_visit.push(replacement);
}
Some(Rewrite::Abandoned(replacements)) => {
Some(rewrite) => {
let replacements = rewrite.new_parent_ids();
assert!(
// Each commit must have a parent, so a parent can
// not just be mapped to nothing. This assertion