Forráskód Böngészése

Revert accidental API change

Jelmer Vernooij 5 hónapja
szülő
commit
87bf424da1
4 módosított fájl, 8 hozzáadás és 9 törlés
  1. 2 2
      dulwich/contrib/swift.py
  2. 1 1
      dulwich/object_store.py
  3. 0 1
      dulwich/pack.py
  4. 5 5
      tests/test_pack.py

+ 2 - 2
dulwich/contrib/swift.py

@@ -896,7 +896,7 @@ class SwiftObjectStore(PackBasedObjectStore):
 
         # Update the header with the new number of objects.
         f.seek(0)
-        write_pack_header(f, len(entries) + len(indexer.ext_refs))  # type: ignore
+        write_pack_header(f, len(entries) + len(indexer.ext_refs()))  # type: ignore
 
         # Must flush before reading (http://bugs.python.org/issue3207)
         f.flush()
@@ -908,7 +908,7 @@ class SwiftObjectStore(PackBasedObjectStore):
         f.seek(0, os.SEEK_CUR)
 
         # Complete the pack.
-        for ext_sha in indexer.ext_refs:  # type: ignore
+        for ext_sha in indexer.ext_refs():  # type: ignore
             assert len(ext_sha) == 20
             type_num, data = self.get_raw(ext_sha)
             offset = f.tell()

+ 1 - 1
dulwich/object_store.py

@@ -1410,7 +1410,7 @@ class DiskObjectStore(PackBasedObjectStore):
 
         pack_sha, extra_entries = extend_pack(
             f,
-            indexer.ext_refs,
+            indexer.ext_refs(),
             get_raw=self.get_raw,
             compression_level=self.pack_compression_level,
             progress=progress,

+ 0 - 1
dulwich/pack.py

@@ -2048,7 +2048,6 @@ class DeltaChainIterator(Generic[T]):
         """Iterate over objects in the pack."""
         return self._walk_all_chains()
 
-    @property
     def ext_refs(self) -> list[bytes]:
         """Return external references."""
         return self._ext_refs

+ 5 - 5
tests/test_pack.py

@@ -1465,7 +1465,7 @@ class DeltaChainIteratorTests(TestCase):
         entries = build_pack(f, [(REF_DELTA, (blob.id, b"blob1"))], store=self.store)
         pack_iter = self.make_pack_iter(f)
         self.assertEntriesMatch([0], entries, pack_iter)
-        self.assertEqual([hex_to_sha(blob.id)], pack_iter.ext_refs)
+        self.assertEqual([hex_to_sha(blob.id)], pack_iter.ext_refs())
 
     def test_ext_ref_chain(self) -> None:
         (blob,) = self.store_blobs([b"blob"])
@@ -1480,7 +1480,7 @@ class DeltaChainIteratorTests(TestCase):
         )
         pack_iter = self.make_pack_iter(f)
         self.assertEntriesMatch([1, 0], entries, pack_iter)
-        self.assertEqual([hex_to_sha(blob.id)], pack_iter.ext_refs)
+        self.assertEqual([hex_to_sha(blob.id)], pack_iter.ext_refs())
 
     def test_ext_ref_chain_degenerate(self) -> None:
         # Test a degenerate case where the sender is sending a REF_DELTA
@@ -1500,7 +1500,7 @@ class DeltaChainIteratorTests(TestCase):
         )
         pack_iter = self.make_pack_iter(f)
         self.assertEntriesMatch([0, 1], entries, pack_iter)
-        self.assertEqual([hex_to_sha(blob.id)], pack_iter.ext_refs)
+        self.assertEqual([hex_to_sha(blob.id)], pack_iter.ext_refs())
 
     def test_ext_ref_multiple_times(self) -> None:
         (blob,) = self.store_blobs([b"blob"])
@@ -1515,7 +1515,7 @@ class DeltaChainIteratorTests(TestCase):
         )
         pack_iter = self.make_pack_iter(f)
         self.assertEntriesMatch([0, 1], entries, pack_iter)
-        self.assertEqual([hex_to_sha(blob.id)], pack_iter.ext_refs)
+        self.assertEqual([hex_to_sha(blob.id)], pack_iter.ext_refs())
 
     def test_multiple_ext_refs(self) -> None:
         b1, b2 = self.store_blobs([b"foo", b"bar"])
@@ -1530,7 +1530,7 @@ class DeltaChainIteratorTests(TestCase):
         )
         pack_iter = self.make_pack_iter(f)
         self.assertEntriesMatch([0, 1], entries, pack_iter)
-        self.assertEqual([hex_to_sha(b1.id), hex_to_sha(b2.id)], pack_iter.ext_refs)
+        self.assertEqual([hex_to_sha(b1.id), hex_to_sha(b2.id)], pack_iter.ext_refs())
 
     def test_bad_ext_ref_non_thin_pack(self) -> None:
         (blob,) = self.store_blobs([b"blob"])