commit d8dea763853cad0c32efbe54a98cb2646d610c62 from: Jelmer Vernooij date: Sun Jan 15 17:46:05 2023 UTC Fix style. commit - 6b145257b772de249303f0e881ca2d3c65ada18e commit + d8dea763853cad0c32efbe54a98cb2646d610c62 blob - 01459a62e2002b01c25d7a8df72a66cab3173398 blob + 25d75eced7d855d9227fce7a9d9d4846e448e10d --- dulwich/object_store.py +++ dulwich/object_store.py @@ -28,7 +28,7 @@ import stat import sys import warnings -from typing import Callable, Dict, List, Optional, Tuple, Protocol, Union, Iterator, Set, Iterable, Sequence, cast +from typing import Callable, Dict, List, Optional, Tuple, Protocol, Iterator, Set, Iterable, Sequence, cast from dulwich.errors import ( NotTreeError, @@ -1280,11 +1280,11 @@ class MissingObjectFinder: missing_tags = want_tags.difference(have_tags) self.objects_to_send.update( {(w, None, Tag.type_num, False) - for w in missing_tags}) + for w in missing_tags}) missing_others = want_others.difference(have_others) self.objects_to_send.update( {(w, None, None, False) - for w in missing_others}) + for w in missing_others}) if progress is None: self.progress = lambda x: None @@ -1355,8 +1355,8 @@ class ObjectStoreGraphWalker: self.shallow = shallow def nak(self): - """Nothing incommon was found.""" - pass + """Nothing in common was found.""" + def ack(self, sha): """Ack that a revision and its ancestors are present in the source.""" if len(sha) != 40: blob - d6e96bd8ea7e6a06b16e9ffa72234f3adeafaabf blob + 12b963679c6d6a7c0cdb67dfca87b37f2bd16d91 --- dulwich/pack.py +++ dulwich/pack.py @@ -979,7 +979,7 @@ class PackStreamReader: def __len__(self): return self._num_objects - def read_objects(self, compute_crc32=False): + def read_objects(self, compute_crc32=False) -> Iterator[UnpackedObject]: """Read the objects in this pack file. Args: @@ -1871,7 +1871,6 @@ def generate_unpacked_objects( else: for oid in todo: yield full_unpacked_object(container[oid]) - def full_unpacked_object(o: ShaFile) -> UnpackedObject: @@ -1918,7 +1917,6 @@ def write_pack_from_container( ) - def write_pack_objects( write, objects: Union[Sequence[ShaFile], Sequence[Tuple[ShaFile, Optional[bytes]]]], blob - 5e6fdd743e7b89621cb2e689de92dde757398848 blob + daf6b6297fe85abdfeab3a58f4592559aa8b2514 --- dulwich/porcelain.py +++ dulwich/porcelain.py @@ -1769,7 +1769,7 @@ def pack_objects(repo, object_ids, packf, idxf, delta_ with open_repo_closing(repo) as r: entries, data_sum = write_pack_from_container( packf.write, - repo.object_store, + r.object_store, [(oid, None) for oid in object_ids], deltify=deltify, delta_window_size=delta_window_size, blob - 9738ceaeb36a007f59bcc0c800043fbc83b4a19b blob + 3cd323f5a44bb429b2c8fd3d7c13d18c6f61d887 --- dulwich/repo.py +++ dulwich/repo.py @@ -75,7 +75,6 @@ from dulwich.object_store import ( PackBasedObjectStore, ObjectStoreGraphWalker, peel_sha, - MissingObjectFinder, ) from dulwich.objects import ( check_hexsha, blob - f1079b7b44c6a493873775c2337be4d7ce18f992 blob + 7f956d5785e08abe9fa3bf809e8a671d51bbe110 --- dulwich/tests/test_greenthreads.py +++ dulwich/tests/test_greenthreads.py @@ -28,7 +28,6 @@ from dulwich.tests import ( ) from dulwich.object_store import ( MemoryObjectStore, - MissingObjectFinder, ) from dulwich.objects import ( Commit,