commit 46fa53a67457a3f2353716b32d15df2e21b3a918
from: Jelmer Vernooij <jelmer@jelmer.uk>
via: GitHub <noreply@github.com>
date: Wed Jan 18 02:55:17 2023 UTC

Merge pull request #1129 from jelmer/various

Make ObjectStore._move_in_pack private, don't reopen files.

commit - 26593ab20f4ac210e3f27c934f57153a3b9c102e
commit + 46fa53a67457a3f2353716b32d15df2e21b3a918
blob - 515139036d5e1c39ea59dceaaef62640abeb79fb
blob + e60395572a6e039f7d90e8b1382d82e6254489da
--- dulwich/object_store.py
+++ dulwich/object_store.py
@@ -875,7 +875,7 @@ class DiskObjectStore(PackBasedObjectStore):
             copier.verify(progress=progress)
             return self._complete_pack(f, path, len(copier), indexer, progress=progress)
 
-    def move_in_pack(self, path):
+    def _move_in_pack(self, path, f):
         """Move a specific file containing a pack into the pack directory.
 
         Note: The file should be on the same file system as the
@@ -884,7 +884,15 @@ class DiskObjectStore(PackBasedObjectStore):
         Args:
           path: Path to the pack file.
         """
-        with PackData(path) as p:
+        f.flush()
+        try:
+            fileno = f.fileno()
+        except AttributeError:
+            pass
+        else:
+            os.fsync(fileno)
+        f.seek(0)
+        with PackData(path, f) as p:
             entries = p.sorted_entries()
             basename = self._get_pack_basepath(entries)
             index_name = basename + ".idx"
@@ -915,16 +923,14 @@ class DiskObjectStore(PackBasedObjectStore):
         import tempfile
 
         fd, path = tempfile.mkstemp(dir=self.pack_dir, suffix=".pack")
-        f = os.fdopen(fd, "wb")
+        f = os.fdopen(fd, "w+b")
         os.chmod(path, PACK_MODE)
 
         def commit():
-            f.flush()
-            os.fsync(fd)
-            f.close()
-            if os.path.getsize(path) > 0:
-                return self.move_in_pack(path)
+            if f.tell() > 0:
+                return self._move_in_pack(path, f)
             else:
+                f.close()
                 os.remove(path)
                 return None