From 8cb45487d7125a14d15c15dfc14b0804eb22ffd6 Mon Sep 17 00:00:00 2001
From: DanConwayDev <DanConwayDev@protonmail.com>
Date: Mon, 5 Jan 2026 13:10:14 +0000
Subject: purgatory: state git data sync use single command to fetch oids

---
 src/purgatory/mod.rs | 114 ++++++++++++++++++++++++---------------------------
 1 file changed, 53 insertions(+), 61 deletions(-)

(limited to 'src')

diff --git a/src/purgatory/mod.rs b/src/purgatory/mod.rs
index f0a9ac5..8634aff 100644
--- a/src/purgatory/mod.rs
+++ b/src/purgatory/mod.rs
@@ -581,72 +581,64 @@ async fn fetch_missing_oids_from_server(
     let oids = missing_oids.to_vec();
 
     tokio::task::spawn_blocking(move || {
-        let mut fetched_count = 0;
-
-        // Try to fetch each missing OID individually
-        // This uses git's ability to fetch specific commits
-        for oid in &oids {
-            // Skip if already exists
-            if oid_exists(&repo_path, oid) {
-                continue;
-            }
+        // Filter to only OIDs that don't already exist
+        let missing: Vec<&String> = oids.iter().filter(|oid| !oid_exists(&repo_path, oid)).collect();
 
-            // git fetch <remote> <sha1>
-            let output = Command::new("git")
-                .args(["fetch", "--depth=1", &server_url, oid])
-                .current_dir(&repo_path)
-                .output();
-
-            match output {
-                Ok(result) if result.status.success() => {
-                    fetched_count += 1;
-                    tracing::debug!(
-                        oid = %oid,
-                        server = %server_url,
-                        "Successfully fetched OID"
-                    );
-                }
-                Ok(result) => {
-                    let stderr = String::from_utf8_lossy(&result.stderr);
-                    tracing::debug!(
-                        oid = %oid,
-                        server = %server_url,
-                        stderr = %stderr,
-                        "git fetch failed for OID"
-                    );
-                }
-                Err(e) => {
-                    tracing::debug!(
-                        oid = %oid,
-                        server = %server_url,
-                        error = %e,
-                        "git fetch command error"
-                    );
-                }
-            }
+        if missing.is_empty() {
+            return Ok(0);
         }
 
-        // If individual fetches didn't work, try a broader fetch
-        if fetched_count == 0 {
-            // Try fetching all refs - this might get us the commits we need
-            let output = Command::new("git")
-                .args(["fetch", "--all", "--tags", &server_url])
-                .current_dir(&repo_path)
-                .output();
-
-            if let Ok(result) = output {
-                if result.status.success() {
-                    // Count how many OIDs we now have
-                    for oid in &oids {
-                        if oid_exists(&repo_path, oid) {
-                            fetched_count += 1;
-                        }
-                    }
-                }
+        // git fetch <remote> <sha1> <sha2> ... - fetch all OIDs in one command
+        let mut args = vec!["fetch", "--depth=1", &server_url];
+        args.extend(missing.iter().map(|s| s.as_str()));
+
+        tracing::debug!(
+            oids = ?missing,
+            server = %server_url,
+            "Fetching OIDs"
+        );
+
+        let output = Command::new("git")
+            .args(&args)
+            .current_dir(&repo_path)
+            .output();
+
+        match output {
+            Ok(result) if result.status.success() => {
+                // Count how many OIDs we now have
+                let fetched_count = missing
+                    .iter()
+                    .filter(|oid| oid_exists(&repo_path, oid))
+                    .count();
+
+                tracing::debug!(
+                    fetched_count = fetched_count,
+                    server = %server_url,
+                    "Successfully fetched OIDs"
+                );
+
+                Ok(fetched_count)
+            }
+            Ok(result) => {
+                let stderr = String::from_utf8_lossy(&result.stderr);
+                tracing::debug!(
+                    oids = ?missing,
+                    server = %server_url,
+                    stderr = %stderr,
+                    "git fetch failed for OIDs"
+                );
+                Ok(0)
+            }
+            Err(e) => {
+                tracing::debug!(
+                    oids = ?missing,
+                    server = %server_url,
+                    error = %e,
+                    "git fetch command error"
+                );
+                Ok(0)
             }
         }
-
-        Ok(fetched_count)
     })
     .await?
 }
-- 
cgit v1.2.3