fix but restore failing for old snapshots

Author: krlvi

crates/but-api/src/commands/oplog.rs

@@ -61,6 +61,25 @@ pub fn list_snapshots(
     Ok(snapshots)
 }
 
+/// Gets a specific snapshot by its commit SHA.
+///
+/// - `project_id`: The ID of the project to get the snapshot for.
+/// - `sha`: The SHA of the snapshot to retrieve.
+///
+/// Returns the `Snapshot` corresponding to the provided SHA.
+///
+/// # Errors
+/// Returns an error if the project cannot be found, if the snapshot SHA is invalid, or if the underlying commit is not a valid snapshot commit
+#[api_cmd]
+#[cfg_attr(feature = "tauri", tauri::command(async))]
+#[instrument(err(Debug))]
+pub fn get_snapshot(project_id: ProjectId, sha: String) -> Result<Snapshot, Error> {
+    let project = gitbutler_project::get(project_id).context("failed to get project")?;
+    let ctx = CommandContext::open(&project, AppSettings::load_from_default_path_creating()?)?;
+    let snapshot = ctx.get_snapshot(sha.parse().map_err(anyhow::Error::from)?)?;
+    Ok(snapshot)
+}
+
 /// Creates a new, on-demand snapshot in the oplog.
 ///
 /// - `project_id`: The ID of the project to create a snapshot for.

crates/but/src/oplog.rs

@@ -128,27 +128,11 @@ pub(crate) fn restore_to_oplog(
     oplog_sha: &str,
     force: bool,
 ) -> anyhow::Result<()> {
-    let snapshots = but_api::oplog::list_snapshots(project.id, 1000, None, None)?;
+    let repo = project.open()?;
+    let commit_id = repo.rev_parse_single(oplog_sha)?.detach();
+    let target_snapshot = &but_api::oplog::get_snapshot(project.id, commit_id.to_string())?;
 
-    // Parse the oplog SHA (support partial SHAs)
-    let commit_sha_string = if oplog_sha.len() >= 7 {
-        // Try to find a snapshot that starts with this SHA
-
-        let matching_snapshot = snapshots
-            .iter()
-            .find(|snapshot| snapshot.commit_id.to_string().starts_with(oplog_sha))
-            .ok_or_else(|| anyhow::anyhow!("No oplog snapshot found matching '{}'", oplog_sha))?;
-
-        matching_snapshot.commit_id.to_string()
-    } else {
-        anyhow::bail!("Oplog SHA must be at least 7 characters long");
-    };
-
-    // Get information about the target snapshot
-    let target_snapshot = snapshots
-        .iter()
-        .find(|snapshot| snapshot.commit_id.to_string() == commit_sha_string)
-        .ok_or_else(|| anyhow::anyhow!("Snapshot {} not found in oplog", commit_sha_string))?;
+    let commit_sha_string = commit_id.to_string();
 
     let target_operation = target_snapshot
         .details

crates/gitbutler-oplog/src/oplog.rs

@@ -141,6 +141,9 @@ pub trait OplogExt {
     /// This is useful to show what has changed in this particular snapshot
     fn snapshot_diff(&self, sha: git2::Oid) -> Result<Vec<TreeChange>>;
 
+    /// Gets a specific snapshot by its commit sha.
+    fn get_snapshot(&self, sha: git2::Oid) -> Result<Snapshot>;
+
     /// Gets the sha of the last snapshot commit if present.
     fn oplog_head(&self) -> Result<Option<git2::Oid>>;
 }
@@ -169,6 +172,26 @@ impl OplogExt for CommandContext {
         commit_snapshot(self.project(), tree_id, details, perm)
     }
 
+    #[instrument(skip(self), err(Debug))]
+    fn get_snapshot(&self, sha: git2::Oid) -> Result<Snapshot> {
+        let repo = self.project().open_for_merging()?;
+        let commit = repo.find_commit(sha.to_gix())?;
+        let commit_time = gix_time_to_git2(commit.time()?);
+        let details = commit
+            .message_raw()?
+            .to_str()
+            .ok()
+            .and_then(|msg| SnapshotDetails::from_str(msg).ok())
+            .ok_or(anyhow!("Commit is not a snapshot"))?;
+
+        let snapshot = Snapshot {
+            commit_id: sha,
+            created_at: commit_time,
+            details: Some(details),
+        };
+        Ok(snapshot)
+    }
+
     #[instrument(skip(self), err(Debug))]
     fn list_snapshots(
         &self,