From fdbd3d0982f615a6d34daea93c9641036e7ebc6a Mon Sep 17 00:00:00 2001 From: mcrakhman Date: Thu, 24 Oct 2024 08:28:36 +0200 Subject: [PATCH] Fix deletion check --- commonspace/object/tree/objecttree/objecttree.go | 3 +++ commonspace/object/tree/objecttree/objecttree_test.go | 2 ++ 2 files changed, 5 insertions(+) diff --git a/commonspace/object/tree/objecttree/objecttree.go b/commonspace/object/tree/objecttree/objecttree.go index 6e40658f..a90cb4e0 100644 --- a/commonspace/object/tree/objecttree/objecttree.go +++ b/commonspace/object/tree/objecttree/objecttree.go @@ -732,6 +732,9 @@ func (ot *objectTree) ChangesAfterCommonSnapshot(theirPath, theirHeads []string) } func (ot *objectTree) ChangesAfterCommonSnapshotLoader(theirPath, theirHeads []string) (LoadIterator, error) { + if ot.isDeleted { + return nil, ErrDeleted + } var ( needFullDocument = len(theirPath) == 0 ourPath = ot.SnapshotPath() diff --git a/commonspace/object/tree/objecttree/objecttree_test.go b/commonspace/object/tree/objecttree/objecttree_test.go index 3336d4a2..e9dea299 100644 --- a/commonspace/object/tree/objecttree/objecttree_test.go +++ b/commonspace/object/tree/objecttree/objecttree_test.go @@ -246,6 +246,8 @@ func TestObjectTree(t *testing.T) { require.NoError(t, err) _, err = aTree.ChangesAfterCommonSnapshot(nil, nil) require.Equal(t, ErrDeleted, err) + _, err = aTree.ChangesAfterCommonSnapshotLoader(nil, nil) + require.Equal(t, ErrDeleted, err) err = aTree.IterateFrom("", nil, func(change *Change) bool { return true })