commit 51af8360c81bfeec0092e29aae44f1df30996ed4 from: Jelmer Vernooij date: Wed Jan 18 19:26:59 2023 UTC Inline _move_in_pack, only used once. commit - 4763ba9399ea4b00a60d7d1fae1c0f494fa11eae commit + 51af8360c81bfeec0092e29aae44f1df30996ed4 blob - dec12e5d435683a97c818906bc125ced6c85b669 blob + 0ae6a2f84b43eb82a57af0cad422e76a523329fb --- dulwich/object_store.py +++ dulwich/object_store.py @@ -886,21 +886,7 @@ class DiskObjectStore(PackBasedObjectStore): copier = PackStreamCopier(read_all, read_some, f, delta_iter=indexer) copier.verify(progress=progress) return self._complete_pack(f, path, len(copier), indexer, progress=progress) - - 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 - packs directory. - - Args: - path: Path to the pack file. - """ - f.seek(0) - with PackData(path, f) as pd: - indexer = PackIndexer.for_pack_data(pd, resolve_ext_ref=self.get_raw) - return self._complete_pack(f, path, len(pd), indexer) - def add_pack(self): """Add a new pack to this object store. @@ -916,7 +902,10 @@ class DiskObjectStore(PackBasedObjectStore): def commit(): if f.tell() > 0: - return self._move_in_pack(path, f) + f.seek(0) + with PackData(path, f) as pd: + indexer = PackIndexer.for_pack_data(pd, resolve_ext_ref=self.get_raw) + return self._complete_pack(f, path, len(pd), indexer) else: f.close() os.remove(path)