From ba1922665582f8ac877146a170f6c89a9c621c52 Mon Sep 17 00:00:00 2001
From: Yuya Nishihara <yuya@tcha.org>
Date: Tue, 9 Jul 2024 19:56:27 +0900
Subject: [PATCH] revset: propagate BackendError from inner file() predicate
 function

We should probably add error propagation path to Revset iterator, and predicate
functions will return Result<bool, RevsetEvaluationError>.
---
 lib/src/default_index/revset_engine.rs | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/lib/src/default_index/revset_engine.rs b/lib/src/default_index/revset_engine.rs
index c3c4637abd..eec315e2c1 100644
--- a/lib/src/default_index/revset_engine.rs
+++ b/lib/src/default_index/revset_engine.rs
@@ -26,7 +26,7 @@ use itertools::Itertools;
 
 use super::rev_walk::{EagerRevWalk, PeekableRevWalk, RevWalk, RevWalkBuilder};
 use super::revset_graph_iterator::RevsetGraphWalk;
-use crate::backend::{ChangeId, CommitId, MillisSinceEpoch};
+use crate::backend::{BackendResult, ChangeId, CommitId, MillisSinceEpoch};
 use crate::commit::Commit;
 use crate::default_index::{AsCompositeIndex, CompositeIndex, IndexPosition};
 use crate::graph::GraphEdge;
@@ -1034,6 +1034,7 @@ fn build_predicate_fn(
     store: Arc<Store>,
     predicate: &RevsetFilterPredicate,
 ) -> Box<dyn ToPredicateFn> {
+    // TODO: propagate BackendError
     match predicate {
         RevsetFilterPredicate::ParentCount(parent_count_range) => {
             let parent_count_range = parent_count_range.clone();
@@ -1074,7 +1075,7 @@ fn build_predicate_fn(
             box_pure_predicate_fn(move |index, pos| {
                 let entry = index.entry_by_pos(pos);
                 let commit = store.get_commit(&entry.commit_id()).unwrap();
-                has_diff_from_parent(&store, index, &commit, matcher.as_ref())
+                has_diff_from_parent(&store, index, &commit, matcher.as_ref()).unwrap()
             })
         }
         RevsetFilterPredicate::HasConflict => box_pure_predicate_fn(move |index, pos| {
@@ -1098,20 +1099,20 @@ fn has_diff_from_parent(
     index: &CompositeIndex,
     commit: &Commit,
     matcher: &dyn Matcher,
-) -> bool {
-    let parents: Vec<_> = commit.parents().try_collect().unwrap();
+) -> BackendResult<bool> {
+    let parents: Vec<_> = commit.parents().try_collect()?;
     if let [parent] = parents.as_slice() {
         // Fast path: no need to load the root tree
         let unchanged = commit.tree_id() == parent.tree_id();
         if matcher.visit(RepoPath::root()) == Visit::AllRecursively {
-            return !unchanged;
+            return Ok(!unchanged);
         } else if unchanged {
-            return false;
+            return Ok(false);
         }
     }
-    let from_tree = rewrite::merge_commit_trees_without_repo(store, &index, &parents).unwrap();
-    let to_tree = commit.tree().unwrap();
-    from_tree.diff(&to_tree, matcher).next().is_some()
+    let from_tree = rewrite::merge_commit_trees_without_repo(store, &index, &parents)?;
+    let to_tree = commit.tree()?;
+    Ok(from_tree.diff(&to_tree, matcher).next().is_some())
 }
 
 #[cfg(test)]