mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-12-26 14:00:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

rewrite: calculate heads_to_remove later, remove it from state

Browse source 
Similar to the previous commit.
This commit is contained in:
Martin von Zweigbergk 2024-03-24 23:47:12 -07:00 committed by Martin von Zweigbergk
parent b3dd038907
commit 2ee1147145
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/src/rewrite.rs
View file

@ -286,7 +286,6 @@ pub(crate) struct DescendantRebaser<'settings, 'repo> {
// Parents of rebased/abandoned commit that should become new heads once their descendants
// have been rebased.
heads_to_add: HashSet<CommitId>,
heads_to_remove: Vec<CommitId>,
// Options to apply during a rebase.
options: RebaseOptions,
@ -367,7 +366,6 @@ impl<'settings, 'repo> DescendantRebaser<'settings, 'repo> {
rebased: Default::default(),
branches,
heads_to_add,
heads_to_remove: Default::default(),
options: Default::default(),
}
}
@ -518,21 +516,21 @@ impl<'settings, 'repo> DescendantRebaser<'settings, 'repo> {
.cloned()
.collect();
let mut heads_to_remove = vec![];
for old_parent_id in self.mut_repo.parent_mapping.keys() {
self.heads_to_add.remove(old_parent_id);
if !new_commits.contains(old_parent_id) || self.rebased.contains_key(old_parent_id) {
self.heads_to_remove.push(old_parent_id.clone());
heads_to_remove.push(old_parent_id.clone());
}
}
let mut view = self.mut_repo.view().store_view().clone();
for commit_id in &self.heads_to_remove {
for commit_id in &heads_to_remove {
view.head_ids.remove(commit_id);
}
for commit_id in &self.heads_to_add {
view.head_ids.insert(commit_id.clone());
}
self.heads_to_remove.clear();
self.heads_to_add.clear();
self.mut_repo.set_view(view);
}