mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-02-01 00:50:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

rewrite: drop redundant unioning of old commits with abandoned commits

Browse source 
We always add abandoned commits as key in `parent_mapping`.
This commit is contained in:
Martin von Zweigbergk 2024-03-29 23:13:01 -07:00 committed by Martin von Zweigbergk
parent db4b905bc9
commit bb1fef3258
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/src/rewrite.rs
View file

@ -298,9 +298,7 @@ impl<'settings, 'repo> DescendantRebaser<'settings, 'repo> {
) -> DescendantRebaser<'settings, 'repo> { ) -> DescendantRebaser<'settings, 'repo> {
let store = mut_repo.store(); let store = mut_repo.store();
let old_commits_expression = let old_commits_expression =
RevsetExpression::commits(mut_repo.parent_mapping.keys().cloned().collect()).union( RevsetExpression::commits(mut_repo.parent_mapping.keys().cloned().collect());
&RevsetExpression::commits(mut_repo.abandoned.iter().cloned().collect()),
);
let to_visit_expression = old_commits_expression let to_visit_expression = old_commits_expression
.descendants() .descendants()
.minus(&old_commits_expression); .minus(&old_commits_expression);
@ -499,10 +497,7 @@ impl<'settings, 'repo> DescendantRebaser<'settings, 'repo> {
.collect(); .collect();
let old_commits_expression = let old_commits_expression =
RevsetExpression::commits(self.mut_repo.parent_mapping.keys().cloned().collect()) RevsetExpression::commits(self.mut_repo.parent_mapping.keys().cloned().collect());
.union(&RevsetExpression::commits(
self.mut_repo.abandoned.iter().cloned().collect(),
));
let heads_to_add_expression = old_commits_expression let heads_to_add_expression = old_commits_expression
.parents() .parents()
.minus(&old_commits_expression); .minus(&old_commits_expression);