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

cli: don't look for added/removed conflicts across old/new heads

Browse source 
removed_heads..added_heads won't stop if new head is added on top of non-head
commit for example.

#2729
This commit is contained in:
Yuya Nishihara 2023-12-21 22:15:37 +09:00
parent dafc900cca
commit 5bf9e4192a
1 changed files with 4 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
cli/src/cli_util.rs
View file

@ -1498,22 +1498,8 @@ See https://github.com/martinvonz/jj/blob/main/docs/working-copy.md#stale-workin
let old_view = old_repo.view(); let old_view = old_repo.view();
let new_repo = self.repo().as_ref(); let new_repo = self.repo().as_ref();
let new_view = new_repo.view(); let new_view = new_repo.view();
let added_heads = RevsetExpression::commits( let old_heads = RevsetExpression::commits(old_view.heads().iter().cloned().collect());
new_view let new_heads = RevsetExpression::commits(new_view.heads().iter().cloned().collect());
.heads()
.iter()
.filter(|id| !old_view.heads().contains(id))
.cloned()
.collect(),
);
let removed_heads = RevsetExpression::commits(
old_view
.heads()
.iter()
.filter(|id| !new_view.heads().contains(id))
.cloned()
.collect(),
);
// Filter the revsets by conflicts instead of reading all commits and doing the // Filter the revsets by conflicts instead of reading all commits and doing the
// filtering here. That way, we can afford to evaluate the revset even if there // filtering here. That way, we can afford to evaluate the revset even if there
// are millions of commits added to the repo, assuming the revset engine can // are millions of commits added to the repo, assuming the revset engine can
@ -1521,8 +1507,8 @@ See https://github.com/martinvonz/jj/blob/main/docs/working-copy.md#stale-workin
// `jj new <conflicted commit>` doesn't result in a message about new conflicts. // `jj new <conflicted commit>` doesn't result in a message about new conflicts.
let conflicts = RevsetExpression::filter(RevsetFilterPredicate::HasConflict) let conflicts = RevsetExpression::filter(RevsetFilterPredicate::HasConflict)
.intersection(&RevsetExpression::filter(RevsetFilterPredicate::File(None))); .intersection(&RevsetExpression::filter(RevsetFilterPredicate::File(None)));
let removed_conflicts_expr = added_heads.range(&removed_heads).intersection(&conflicts); let removed_conflicts_expr = new_heads.range(&old_heads).intersection(&conflicts);
let added_conflicts_expr = removed_heads.range(&added_heads).intersection(&conflicts); let added_conflicts_expr = old_heads.range(&new_heads).intersection(&conflicts);
let get_commits = |expr: Rc<RevsetExpression>| -> Result<Vec<Commit>, CommandError> { let get_commits = |expr: Rc<RevsetExpression>| -> Result<Vec<Commit>, CommandError> {
let commits = expr let commits = expr