mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-30 16:10:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

refs: leverage Conflict::is_resolved()

Browse source
This commit is contained in:
Yuya Nishihara 2023-07-19 21:15:18 +09:00
parent 465b8d9cf0
commit 961bb49ff0
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/src/op_store.rs
View file

@ -200,7 +200,7 @@ impl RefTarget {
// TODO: overloaded naming: is_conflict() vs as_conflict()
pub fn is_conflict(&self) -> bool {
self.conflict.as_resolved().is_none() // TODO: !is_resolved()
!self.conflict.is_resolved()
}
pub fn removed_ids(&self) -> impl Iterator<Item = &CommitId> {

3
lib/src/refs.rs
View file

@ -37,8 +37,7 @@ pub fn merge_ref_targets(
.flatten()
.simplify();
// TODO: switch to conflict.is_resolved()
if conflict.as_resolved().is_some() {
if conflict.is_resolved() {
RefTarget::from_conflict(conflict)
} else {
let conflict = merge_ref_targets_non_trivial(index, conflict);