gc: tolerate historical views naming objects pruned under an earlier, shorter op-retention 21b2aec279ff

--- crates/oxy-core/src/repo/gc.rs
-                changes.extend(self.store.get_state(&st)?.heads);
-                let policy = crate::policy::Policy::decode(&self.store.get_typed(&p, ObjectType::Policy)?)?;
-            // Beyond the shallow boundary there is nothing to keep.
+        // A historical view may name objects pruned under an earlier, shorter
+        // retention; there is nothing to keep for those.
+                match self.store.get_state(&st) {
+                    Ok(s) => changes.extend(s.heads),
+                    Err(StoreError::NotFound(_)) => continue,
+                    Err(e) => return Err(e.into()),
+                }
+                let bytes = match self.store.get_typed(&p, ObjectType::Policy) {
+                    Ok(b) => b,
+                    Err(StoreError::NotFound(_)) => continue,
+                    Err(e) => return Err(e.into()),
+                };
+                let policy = crate::policy::Policy::decode(&bytes)?;
+            // Beyond the shallow boundary, or pruned under an earlier
+            // retention, there is nothing to keep.
--- crates/oxy-core/src/repo/tests.rs
-    let repo = Repo::open(root).unwrap().with_home(root.join("home"));
+    let mut repo = Repo::open(root).unwrap().with_home(root.join("home"));
+    // Restoring the default retention makes the old views roots again; the
+    // working copies they name were pruned, which gc tolerates.
+    repo.config.set("core.op-retention", "90").unwrap();
+    repo.save_config().unwrap();
+    let repo = Repo::open(root).unwrap().with_home(root.join("home"));
+    let r = repo.gc(false).unwrap();
+    assert_eq!(r.pruned.objects, 0);
+    assert_eq!(repo.log().unwrap().len(), 4);

Author

Andy McCall @andymccall <[email protected]>

When

1 month ago · 2026-09-26 23:34 UTC

Signature

✔ signed by Andy McCall

Hash

21b2aec279ff41d19c1864f5c6a48f194c64d32ff6b83be6e21ed2e574420f5c

Depends on

2863456a0f6d 982864068a59 ba160f60219e d02e545dc265

Depended on by

6f8aeb996558

In bookmarks

agents-in-readme bare-hashes carried-not-removed carry-identical doctor-trust identical-sides keyless-tags main merge-remote-bookmark only-help-103 paths-for-resolutions-and-amend push-notes show-stat subrepo-pin-state switch-says

In tags

v0.1.0 v0.10.0 v0.11.0 v0.2.0 v0.3.0 v0.3.1 v0.4.0 v0.4.1 v0.4.2 v0.4.3 v0.4.4 v0.4.5 v0.4.6 v0.5.0 v0.5.1 v0.6.0 v0.7.0 v0.8.0 v0.9.0

Edits

8 atoms, 0 tree operations, 2 files

Browse the tree at this change

67 unchanged lines

                attests.push(r);

            }

        }

        // A historical view may name objects pruned under an earlier, shorter

        // retention; there is nothing to keep for those.

        for st in states {

            if keep.insert(st) {

                changes.extend(self.store.get_state(&st)?.heads);

                match self.store.get_state(&st) {

                    Ok(s) => changes.extend(s.heads),

                    Err(StoreError::NotFound(_)) => continue,

                    Err(e) => return Err(e.into()),

                }

            }

        }

        for p in policies {

            if keep.insert(p) {

                let policy = crate::policy::Policy::decode(&self.store.get_typed(&p, ObjectType::Policy)?)?;

                let bytes = match self.store.get_typed(&p, ObjectType::Policy) {

                    Ok(b) => b,

                    Err(StoreError::NotFound(_)) => continue,

                    Err(e) => return Err(e.into()),

                };

                let policy = crate::policy::Policy::decode(&bytes)?;

                for id in &policy.identities {

                    keep.insert(id.hash());

                }

8 unchanged lines

            if !keep.insert(h) {

                continue;

            }

            // Beyond the shallow boundary there is nothing to keep.

            // Beyond the shallow boundary, or pruned under an earlier

            // retention, there is nothing to keep.

            let c = match self.store.get_change(&h) {

                Ok(c) => c,

                Err(StoreError::NotFound(_)) => continue,

32 unchanged lines

783 unchanged lines

    // working copies go, everything reachable stays.

    repo.config.set("core.op-retention", "0").unwrap();

    repo.save_config().unwrap();

    let repo = Repo::open(root).unwrap().with_home(root.join("home"));

    let mut repo = Repo::open(root).unwrap().with_home(root.join("home"));

    let r = repo.gc(true).unwrap();

    assert!(r.pruned.objects >= 5, "{r:?}");

    let after = repo.store().list().unwrap();

20 unchanged lines

    let r = repo.gc(true).unwrap();

    assert!(r.pruned.objects > 0);

    assert_eq!(repo.log().unwrap().len(), 4);

    // Restoring the default retention makes the old views roots again; the

    // working copies they name were pruned, which gc tolerates.

    repo.config.set("core.op-retention", "90").unwrap();

    repo.save_config().unwrap();

    let repo = Repo::open(root).unwrap().with_home(root.join("home"));

    let r = repo.gc(false).unwrap();

    assert_eq!(r.pruned.objects, 0);

    assert_eq!(repo.log().unwrap().len(), 4);

}

#[test]

501 unchanged lines