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

lib: mild refactoring made possible by previous commit

Browse source 
Inline `create_descendant_commits`, move some functionality of
`DescendantRebaser::rebase_next` to `rebase_all`, a seemingly more logical
location.
This commit is contained in:
Ilya Grigoriev 2023-12-22 17:39:21 -08:00
parent 277b81ff6f
commit ddec3f91b2
2 changed files with 12 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
lib/src/repo.rs
View file

@ -882,21 +882,6 @@ impl MutableRepo {
!(self.rewritten_commits.is_empty() && self.abandoned_commits.is_empty()) !(self.rewritten_commits.is_empty() && self.abandoned_commits.is_empty())
} }
/// Creates a `DescendantRebaser` to rebase descendants of the recorded
/// rewritten and abandoned commits.
// TODO(ilyagr): Inline this. It's only used in tests.
fn create_descendant_rebaser<'settings, 'repo>(
&'repo mut self,
settings: &'settings UserSettings,
) -> DescendantRebaser<'settings, 'repo> {
DescendantRebaser::new(
settings,
self,
self.rewritten_commits.clone(),
self.abandoned_commits.clone(),
)
}
/// After the rebaser returned by this function is dropped, /// After the rebaser returned by this function is dropped,
/// self.clear_descendant_rebaser_plans() needs to be called. /// self.clear_descendant_rebaser_plans() needs to be called.
fn rebase_descendants_return_rebaser<'settings, 'repo>( fn rebase_descendants_return_rebaser<'settings, 'repo>(
@ -908,7 +893,12 @@ impl MutableRepo {
// Optimization // Optimization
return Ok(None); return Ok(None);
} }
let mut rebaser = self.create_descendant_rebaser(settings); let mut rebaser = DescendantRebaser::new(
settings,
self,
self.rewritten_commits.clone(),
self.abandoned_commits.clone(),
);
*rebaser.mut_options() = options; *rebaser.mut_options() = options;
rebaser.rebase_all()?; rebaser.rebase_all()?;
Ok(Some(rebaser)) Ok(Some(rebaser))

14
lib/src/rewrite.rs
View file

@ -587,9 +587,12 @@ impl<'settings, 'repo> DescendantRebaser<'settings, 'repo> {
new_commit, new_commit,
})); }));
} }
// TODO: As the TODO above says, we should probably change the API. Even if we Ok(None)
// don't, we should at least make this code not do any work if you call }
// rebase_next() after we've returned None.
pub fn rebase_all(&mut self) -> Result<(), TreeMergeError> {
while self.rebase_next()?.is_some() {}
// TODO: As the TODO above says, we should probably change the API.
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);
@ -600,11 +603,6 @@ 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);
Ok(None)
}
pub fn rebase_all(&mut self) -> Result<(), TreeMergeError> {
while self.rebase_next()?.is_some() {}
Ok(()) Ok(())
} }
} }