Add a revset filter predicate to find commits without conflicts.

Used in follow up commits to identify decendants of a conflicted commit without conflicts of their own.
jj-vcs · Jul 31, 2024 · 129aca4 · 129aca4
1 parent 51e11ff
commit 129aca4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/lib/src/default_index/revset_engine.rs b/lib/src/default_index/revset_engine.rs
@@ -1092,6 +1092,11 @@ fn build_predicate_fn(
                     .unwrap()
             })
         }
+        RevsetFilterPredicate::HasNoConflict => box_pure_predicate_fn(move |index, pos| {
+            let entry = index.entry_by_pos(pos);
+            let commit = store.get_commit(&entry.commit_id()).unwrap();
+            !commit.has_conflict().unwrap()
+        }),
         RevsetFilterPredicate::HasConflict => box_pure_predicate_fn(move |index, pos| {
             let entry = index.entry_by_pos(pos);
             let commit = store.get_commit(&entry.commit_id()).unwrap();

diff --git a/lib/src/revset.rs b/lib/src/revset.rs
@@ -139,6 +139,8 @@ pub enum RevsetFilterPredicate {
         text: StringPattern,
         files: FilesetExpression,
     },
+    /// Commits without conflicts
+    HasNoConflict,
     /// Commits with conflicts
     HasConflict,
     /// Custom predicates provided by extensions