Jelmer Vernooij 3 months ago
parent
commit
6b63699c40

+ 1 - 3
dulwich/client.py

@@ -2846,9 +2846,7 @@ class Urllib3HttpGitClient(AbstractHttpGitClient):
         if resp.status == 407:
             raise HTTPProxyUnauthorized(resp.headers.get("Proxy-Authenticate"), url)
         if resp.status != 200:
-            raise GitProtocolError(
-                f"unexpected http resp {resp.status} for {url}"
-            )
+            raise GitProtocolError(f"unexpected http resp {resp.status} for {url}")
 
         resp.content_type = resp.headers.get("Content-Type")
         # Check if geturl() is available (urllib3 version >= 1.23)

+ 1 - 3
dulwich/contrib/requests_vendor.py

@@ -80,9 +80,7 @@ class RequestsHttpGitClient(AbstractHttpGitClient):
         if resp.status_code == 407:
             raise HTTPProxyUnauthorized(resp.headers.get("Proxy-Authenticate"), url)
         if resp.status_code != 200:
-            raise GitProtocolError(
-                f"unexpected http resp {resp.status_code} for {url}"
-            )
+            raise GitProtocolError(f"unexpected http resp {resp.status_code} for {url}")
 
         # Add required fields as stated in AbstractHttpGitClient._http_request
         resp.content_type = resp.headers.get("Content-Type")

+ 1 - 3
dulwich/hooks.py

@@ -102,9 +102,7 @@ class ShellHook(Hook):
             if ret != 0:
                 if self.post_exec_callback is not None:
                     self.post_exec_callback(0, *args)
-                raise HookError(
-                    f"Hook {self.name} exited with non-zero status {ret}"
-                )
+                raise HookError(f"Hook {self.name} exited with non-zero status {ret}")
             if self.post_exec_callback is not None:
                 return self.post_exec_callback(1, *args)
         except OSError:  # no file. silent failure.

+ 3 - 9
dulwich/object_store.py

@@ -897,9 +897,7 @@ class DiskObjectStore(PackBasedObjectStore):
         entries = []
         for i, entry in enumerate(indexer):
             if progress is not None:
-                progress(
-                    f"generating index: {i}/{num_objects}\r".encode("ascii")
-                )
+                progress(f"generating index: {i}/{num_objects}\r".encode("ascii"))
             entries.append(entry)
 
         pack_sha, extra_entries = extend_pack(
@@ -1380,9 +1378,7 @@ class MissingObjectFinder:
         while True:
             if not self.objects_to_send:
                 self.progress(
-                    f"counting objects: {len(self.sha_done)}, done.\n".encode(
-                        "ascii"
-                    )
+                    f"counting objects: {len(self.sha_done)}, done.\n".encode("ascii")
                 )
                 raise StopIteration
             (sha, name, type_num, leaf) = self.objects_to_send.pop()
@@ -1411,9 +1407,7 @@ class MissingObjectFinder:
             self.add_todo([(self._tagged[sha], None, None, True)])
         self.sha_done.add(sha)
         if len(self.sha_done) % 1000 == 0:
-            self.progress(
-                f"counting objects: {len(self.sha_done)}\r".encode("ascii")
-            )
+            self.progress(f"counting objects: {len(self.sha_done)}\r".encode("ascii"))
         if type_num is None:
             pack_hint = None
         else:

+ 4 - 12
dulwich/pack.py

@@ -1121,9 +1121,7 @@ class PackStreamCopier(PackStreamReader):
             if self._delta_iter:
                 self._delta_iter.record(unpacked)
             if progress is not None:
-                progress(
-                    f"copying pack entries: {i}/{len(self)}\r".encode("ascii")
-                )
+                progress(f"copying pack entries: {i}/{len(self)}\r".encode("ascii"))
         if progress is not None:
             progress(f"copied {i} pack entries\n".encode("ascii"))
 
@@ -1791,9 +1789,7 @@ def find_reusable_deltas(
         )
     ):
         if progress is not None and i % 1000 == 0:
-            progress(
-                f"checking for reusable deltas: {i}/{len(object_ids)}\r".encode()
-            )
+            progress(f"checking for reusable deltas: {i}/{len(object_ids)}\r".encode())
         if unpacked.pack_type_num == REF_DELTA:
             hexsha = sha_to_hex(unpacked.delta_base)
             if hexsha in object_ids or hexsha in other_haves:
@@ -2110,9 +2106,7 @@ class PackChunkGenerator:
         for i, unpacked in enumerate(records):
             type_num = unpacked.pack_type_num
             if progress is not None and i % 1000 == 0:
-                progress(
-                    (f"writing pack data: {i}/{num_records}\r").encode("ascii")
-                )
+                progress((f"writing pack data: {i}/{num_records}\r").encode("ascii"))
             raw: Union[list[bytes], tuple[int, list[bytes]], tuple[bytes, list[bytes]]]
             if unpacked.delta_base is not None:
                 try:
@@ -2763,9 +2757,7 @@ def extend_pack(
     for i, object_id in enumerate(object_ids):
         if progress is not None:
             progress(
-                (f"writing extra base objects: {i}/{len(object_ids)}\r").encode(
-                    "ascii"
-                )
+                (f"writing extra base objects: {i}/{len(object_ids)}\r").encode("ascii")
             )
         assert len(object_id) == 20
         type_num, data = get_raw(object_id)

+ 1 - 3
dulwich/patch.py

@@ -64,9 +64,7 @@ def write_commit_patch(
         b"Date: " + time.strftime("%a, %d %b %Y %H:%M:%S %Z").encode(encoding) + b"\n"
     )
     f.write(
-        (f"Subject: [PATCH {num}/{total}] ").encode(encoding)
-        + commit.message
-        + b"\n"
+        (f"Subject: [PATCH {num}/{total}] ").encode(encoding) + commit.message + b"\n"
     )
     f.write(b"\n")
     f.write(b"---\n")

+ 1 - 3
dulwich/server.py

@@ -407,9 +407,7 @@ class UploadPackHandler(PackHandler):
             return
 
         self._start_pack_send_phase()
-        self.progress(
-            (f"counting objects: {len(object_ids)}, done.\n").encode("ascii")
-        )
+        self.progress((f"counting objects: {len(object_ids)}, done.\n").encode("ascii"))
 
         write_pack_from_container(
             self.write_pack_data, self.repo.object_store, object_ids

+ 3 - 1
tests/test_client.py

@@ -103,7 +103,9 @@ class GitClientTests(TestCase):
         self.client = DummyClient(lambda x: True, self.rin.read, self.rout.write)
 
     def test_caps(self) -> None:
-        agent_cap = "agent=dulwich/{}.{}.{}".format(*dulwich.__version__).encode("ascii")
+        agent_cap = "agent=dulwich/{}.{}.{}".format(*dulwich.__version__).encode(
+            "ascii"
+        )
         self.assertEqual(
             {
                 b"multi_ack",

+ 3 - 3
tests/test_pack.py

@@ -1001,9 +1001,9 @@ class TestPackIterator(DeltaChainIterator):
         )
 
     def _resolve_object(self, offset, pack_type_num, base_chunks):
-        assert offset not in self._unpacked_offsets, (
-            f"Attempted to re-inflate offset {offset}"
-        )
+        assert (
+            offset not in self._unpacked_offsets
+        ), f"Attempted to re-inflate offset {offset}"
         self._unpacked_offsets.add(offset)
         return super()._resolve_object(offset, pack_type_num, base_chunks)