ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

rewrite: extract a function for updating heads

Browse source
This commit is contained in:
Martin von Zweigbergk 2024-03-24 23:33:03 -07:00 committed by Martin von Zweigbergk
parent 0f7a86d725
commit 9511de486e
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/src/rewrite.rs
View file

@ -522,11 +522,7 @@ impl<'settings, 'repo> DescendantRebaser<'settings, 'repo> {
Ok(()) Ok(())
} }
pub fn rebase_all(&mut self) -> Result<(), TreeMergeError> { fn update_heads(&mut self) {
while let Some(old_commit) = self.to_visit.pop() {
self.rebase_one(old_commit)?;
}
self.update_all_references()?;
let mut view = self.mut_repo.view().store_view().clone(); let mut view = self.mut_repo.view().store_view().clone();
for commit_id in &self.heads_to_remove { for commit_id in &self.heads_to_remove {
view.head_ids.remove(commit_id); view.head_ids.remove(commit_id);
@ -537,6 +533,15 @@ impl<'settings, 'repo> DescendantRebaser<'settings, 'repo> {
self.heads_to_remove.clear(); self.heads_to_remove.clear();
self.heads_to_add.clear(); self.heads_to_add.clear();
self.mut_repo.set_view(view); self.mut_repo.set_view(view);
}
pub fn rebase_all(&mut self) -> Result<(), TreeMergeError> {
while let Some(old_commit) = self.to_visit.pop() {
self.rebase_one(old_commit)?;
}
self.update_all_references()?;
self.update_heads();
Ok(()) Ok(())
} }
} }