From ed99e21bc4e702a8504fa778b8913e70d56a0d87 Mon Sep 17 00:00:00 2001
From: Martin von Zweigbergk <martinvonz@google.com>
Date: Sat, 19 Apr 2025 18:16:39 -0700
Subject: [PATCH] revset: rename `StoreError` variants to `Backend`

I haven't checked, but I think "store" is a holdover from a long time
ago.
---
 cli/src/command_error.rs |  2 +-
 lib/src/revset.rs        | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cli/src/command_error.rs b/cli/src/command_error.rs
index f66a68152..633f780cd 100644
--- a/cli/src/command_error.rs
+++ b/cli/src/command_error.rs
@@ -897,7 +897,7 @@ fn revset_resolution_error_hint(err: &RevsetResolutionError) -> Option<String> {
         | RevsetResolutionError::WorkspaceMissingWorkingCopy { .. }
         | RevsetResolutionError::AmbiguousCommitIdPrefix(_)
         | RevsetResolutionError::AmbiguousChangeIdPrefix(_)
-        | RevsetResolutionError::StoreError(_)
+        | RevsetResolutionError::Backend(_)
         | RevsetResolutionError::Other(_) => None,
     }
 }
diff --git a/lib/src/revset.rs b/lib/src/revset.rs
index cad6173e4..a661ba82e 100644
--- a/lib/src/revset.rs
+++ b/lib/src/revset.rs
@@ -87,8 +87,8 @@ pub enum RevsetResolutionError {
     AmbiguousCommitIdPrefix(String),
     #[error("Change ID prefix `{0}` is ambiguous")]
     AmbiguousChangeIdPrefix(String),
-    #[error("Unexpected error from store")]
-    StoreError(#[source] BackendError),
+    #[error("Unexpected error from commit backend")]
+    Backend(#[source] BackendError),
     #[error(transparent)]
     Other(#[from] Box<dyn std::error::Error + Send + Sync>),
 }
@@ -96,8 +96,8 @@ pub enum RevsetResolutionError {
 /// Error occurred during revset evaluation.
 #[derive(Debug, Error)]
 pub enum RevsetEvaluationError {
-    #[error("Unexpected error from store")]
-    StoreError(#[from] BackendError),
+    #[error("Unexpected error from commit backend")]
+    Backend(#[from] BackendError),
     #[error(transparent)]
     Other(Box<dyn std::error::Error + Send + Sync>),
 }
@@ -107,7 +107,7 @@ impl RevsetEvaluationError {
     // BackendError
     pub fn into_backend_error(self) -> BackendError {
         match self {
-            Self::StoreError(err) => err,
+            Self::Backend(err) => err,
             Self::Other(err) => BackendError::Other(err),
         }
     }
@@ -1812,7 +1812,7 @@ fn reload_repo_at_operation(
     let operation = op_walk::resolve_op_with_repo(base_repo, op_str)
         .map_err(|err| RevsetResolutionError::Other(err.into()))?;
     base_repo.reload_at(&operation).map_err(|err| match err {
-        RepoLoaderError::Backend(err) => RevsetResolutionError::StoreError(err),
+        RepoLoaderError::Backend(err) => RevsetResolutionError::Backend(err),
         RepoLoaderError::IndexRead(_)
         | RepoLoaderError::OpHeadResolution(_)
         | RepoLoaderError::OpHeadsStoreError(_)
@@ -2207,7 +2207,7 @@ impl ExpressionStateFolder<UserExpressionState, ResolvedExpressionState>
                     RevsetResolutionError::EmptyString
                     | RevsetResolutionError::AmbiguousCommitIdPrefix(_)
                     | RevsetResolutionError::AmbiguousChangeIdPrefix(_)
-                    | RevsetResolutionError::StoreError(_)
+                    | RevsetResolutionError::Backend(_)
                     | RevsetResolutionError::Other(_) => Err(err),
                 })
             }
@@ -2531,7 +2531,7 @@ impl<I: Iterator<Item = Result<CommitId, RevsetEvaluationError>>> Iterator
             let commit_id = commit_id?;
             self.store
                 .get_commit(&commit_id)
-                .map_err(RevsetEvaluationError::StoreError)
+                .map_err(RevsetEvaluationError::Backend)
         })
     }
 }