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

rewrite: pass root commits into find_descendants_to_rebase()

Browse source 
I'm going to add another caller that wants to rebase from given roots
instead.
This commit is contained in:
Martin von Zweigbergk 2024-04-15 21:46:51 -07:00 committed by Martin von Zweigbergk
parent a5e6b1f997
commit ad1ee2d1d2
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib/src/repo.rs
View file

@ -1106,16 +1106,18 @@ impl MutableRepo {
self.set_view(view);
}
/// Find descendants of commits in `parent_mapping` and then return them in
/// Find descendants of `root`, unless they've already been rewritten
/// (according to `parent_mapping`), and then return them in
/// an order they should be rebased in. The result is in reverse order
/// so the next value can be removed from the end.
fn find_descendants_to_rebase(&self) -> BackendResult<Vec<Commit>> {
fn find_descendants_to_rebase(&self, roots: Vec<CommitId>) -> BackendResult<Vec<Commit>> {
let store = self.store();
let old_commits_expression =
RevsetExpression::commits(self.parent_mapping.keys().cloned().collect());
let to_visit_expression = old_commits_expression
let to_visit_expression =
RevsetExpression::commits(roots)
.descendants()
.minus(&old_commits_expression);
.minus(&RevsetExpression::commits(
self.parent_mapping.keys().cloned().collect(),
));
let to_visit_revset = to_visit_expression
.evaluate_programmatic(self)
.map_err(|err| match err {
@ -1164,7 +1166,8 @@ impl MutableRepo {
return Ok(None);
}
let to_visit = self.find_descendants_to_rebase()?;
let to_visit =
self.find_descendants_to_rebase(self.parent_mapping.keys().cloned().collect())?;
let mut rebaser = DescendantRebaser::new(settings, self, to_visit);
*rebaser.mut_options() = options;
rebaser.rebase_all()?;