Fix ruff issues (#1886)

dulwich/cli.py

@@ -1110,7 +1110,7 @@ def _get_commit_message_with_template(initial_message, repo=None, commit=None):
     # Add branch info if repo is provided
     if repo:
         try:
-            ref_names, ref_sha = repo.refs.follow(b"HEAD")
+            ref_names, _ref_sha = repo.refs.follow(b"HEAD")
             ref_path = ref_names[-1]  # Get the final reference
             if ref_path.startswith(b"refs/heads/"):
                 branch = ref_path[11:]  # Remove 'refs/heads/' prefix
@@ -3670,7 +3670,7 @@ class cmd_bundle(Command):
                 if ".." in ref_arg:
                     range_result = parse_commit_range(repo, ref_arg)
                     if range_result:
-                        start_commit, end_commit = range_result
+                        start_commit, _end_commit = range_result
                         prerequisites.append(start_commit.id)
                         # For ranges like A..B, we need to include B if it's a ref
                         # Split the range to get the end part

dulwich/client.py

@@ -1339,7 +1339,7 @@ class TraditionalGitClient(GitClient):
 
         """
         self.protocol_version = DEFAULT_GIT_PROTOCOL_VERSION_SEND
-        proto, unused_can_read, stderr = self._connect(b"receive-pack", path)
+        proto, _unused_can_read, stderr = self._connect(b"receive-pack", path)
         with proto:
             try:
                 old_refs, server_capabilities = read_pkt_refs_v1(proto.read_pkt_seq())
@@ -1632,7 +1632,7 @@ class TraditionalGitClient(GitClient):
             subdirs: Optional subdirectories to include
             prefix: Optional prefix for archived files
         """
-        proto, can_read, stderr = self._connect(b"upload-archive", path)
+        proto, _can_read, stderr = self._connect(b"upload-archive", path)
         with proto:
             if format is not None:
                 proto.write_pkt_line(b"argument --format=" + format)
@@ -1851,7 +1851,7 @@ def find_git_command() -> list[str]:
             return ["cmd", "/c", "git"]
         else:
             try:
-                status, git = win32api.FindExecutable("git")
+                _status, git = win32api.FindExecutable("git")
                 return [git]
             except pywintypes.error:
                 return ["cmd", "/c", "git"]
@@ -3127,7 +3127,7 @@ class AbstractHttpGitClient(GitClient):
                             server_capabilities,
                         ) = read_pkt_refs_v1(proto.read_pkt_seq())
                         (refs, peeled) = split_peeled_refs(refs)
-                        (symrefs, agent) = _extract_symrefs_and_agent(
+                        (symrefs, _agent) = _extract_symrefs_and_agent(
                             server_capabilities
                         )
                         if ref_prefix is not None:
@@ -3198,8 +3198,8 @@ class AbstractHttpGitClient(GitClient):
 
         """
         url = self._get_url(path)
-        old_refs, server_capabilities, url, symrefs, peeled = self._discover_references(
-            b"git-receive-pack", url
+        old_refs, server_capabilities, url, _symrefs, _peeled = (
+            self._discover_references(b"git-receive-pack", url)
         )
         (
             negotiated_capabilities,
@@ -3278,7 +3278,7 @@ class AbstractHttpGitClient(GitClient):
 
         """
         url = self._get_url(path)
-        refs, server_capabilities, url, symrefs, peeled = self._discover_references(
+        refs, server_capabilities, url, symrefs, _peeled = self._discover_references(
             b"git-upload-pack",
             url,
             protocol_version=protocol_version,

dulwich/contrib/swift.py

@@ -648,7 +648,7 @@ class SwiftPackData(PackData):
             raise Exception(f"Could not get stats for {self._filename}")
         self.pack_length = int(headers["content-length"])
         pack_reader = SwiftPackReader(self.scon, str(self._filename), self.pack_length)
-        (version, self._num_objects) = read_pack_header(pack_reader.read)
+        (_version, self._num_objects) = read_pack_header(pack_reader.read)
         self._offset_cache = LRUSizeCache(
             1024 * 1024 * self.scon.cache_length,
             compute_size=_compute_object_size,
@@ -984,7 +984,7 @@ class SwiftInfoRefsContainer(InfoRefsContainer):
         else:
             f = obj
         refs = read_info_refs(f)
-        (refs, peeled) = split_peeled_refs(refs)
+        (refs, _peeled) = split_peeled_refs(refs)
         if old_ref is not None:
             if refs[name] != old_ref:
                 return False

dulwich/index.py

@@ -638,7 +638,7 @@ def read_cache_entry(
 
     if version >= 4:
         # Version 4: paths are always compressed (name_len should be 0)
-        name, consumed = _decompress_path_from_stream(f, previous_path)
+        name, _consumed = _decompress_path_from_stream(f, previous_path)
     else:
         # Versions < 4: regular name reading
         name = f.read(flags & FLAG_NAMEMASK)

dulwich/merge.py

@@ -331,7 +331,7 @@ class Merger:
                 theirs_entry = None
 
             # Extract mode and sha
-            base_mode, base_sha = base_entry if base_entry else (None, None)
+            _base_mode, base_sha = base_entry if base_entry else (None, None)
             ours_mode, ours_sha = ours_entry if ours_entry else (None, None)
             theirs_mode, theirs_sha = theirs_entry if theirs_entry else (None, None)
 

dulwich/notes.py

@@ -177,7 +177,7 @@ class NotesTree:
                 # Check a sample directory to determine if it's level 1 or 2
                 sample_dir_name = dir_names[0]
                 try:
-                    sample_mode, sample_sha = self._tree[sample_dir_name]
+                    _sample_mode, sample_sha = self._tree[sample_dir_name]
                     sample_tree = self._object_store[sample_sha]
                     assert isinstance(sample_tree, Tree)
 

dulwich/object_store.py

@@ -717,7 +717,7 @@ class PackBasedObjectStore(BaseObjectStore, PackedObjectContainer):
         pack_cache = self._pack_cache
         self._pack_cache = {}
         while pack_cache:
-            (name, pack) = pack_cache.popitem()
+            (_name, pack) = pack_cache.popitem()
             pack.close()
 
     def _iter_cached_packs(self) -> Iterator[Pack]:

dulwich/objects.py

@@ -1056,12 +1056,12 @@ class Tag(ShaFile):
             if keyid is not None:
                 key = c.get_key(keyid)
                 with gpg.Context(armor=True, signers=[key]) as ctx:
-                    self.signature, unused_result = ctx.sign(
+                    self.signature, _unused_result = ctx.sign(
                         self.as_raw_string(),
                         mode=gpg.constants.sig.mode.DETACH,
                     )
             else:
-                self.signature, unused_result = c.sign(
+                self.signature, _unused_result = c.sign(
                     self.as_raw_string(), mode=gpg.constants.sig.mode.DETACH
                 )
 
@@ -1770,12 +1770,12 @@ class Commit(ShaFile):
             if keyid is not None:
                 key = c.get_key(keyid)
                 with gpg.Context(armor=True, signers=[key]) as ctx:
-                    self.gpgsig, unused_result = ctx.sign(
+                    self.gpgsig, _unused_result = ctx.sign(
                         self.as_raw_string(),
                         mode=gpg.constants.sig.mode.DETACH,
                     )
             else:
-                self.gpgsig, unused_result = c.sign(
+                self.gpgsig, _unused_result = c.sign(
                     self.as_raw_string(), mode=gpg.constants.sig.mode.DETACH
                 )
 

dulwich/objectspec.py

@@ -91,7 +91,7 @@ def parse_object(repo: "Repo", objectish: Union[bytes, str]) -> "ShaFile":
         if not rev:
             raise NotImplementedError("Index path lookup (:path) not yet supported")
         tree = parse_tree(repo, rev)
-        mode, sha = tree.lookup_path(repo.object_store.__getitem__, path)
+        _mode, sha = tree.lookup_path(repo.object_store.__getitem__, path)
         return repo[sha]
 
     # Handle @{N} - reflog lookup
@@ -115,7 +115,7 @@ def parse_object(repo: "Repo", objectish: Union[bytes, str]) -> "ShaFile":
     if objectish.endswith(b"^{}"):
         obj = _resolve_object(repo, objectish[:-3])
         while isinstance(obj, Tag):
-            obj_type, obj_sha = obj.object
+            _obj_type, obj_sha = obj.object
             obj = repo[obj_sha]
         return obj
 
@@ -209,7 +209,7 @@ def parse_tree(
         return tree
     elif isinstance(o, Tag):
         # Tag handling - dereference and recurse
-        obj_type, obj_sha = o.object
+        _obj_type, obj_sha = o.object
         return parse_tree(repo, obj_sha)
     assert isinstance(o, Tree)
     return o
@@ -413,7 +413,7 @@ def parse_commit(
     def dereference_tag(obj: ShaFile) -> "Commit":
         """Follow tag references until we reach a non-tag object."""
         while isinstance(obj, Tag):
-            obj_type, obj_sha = obj.object
+            _obj_type, obj_sha = obj.object
             try:
                 obj = repo.object_store[obj_sha]
             except KeyError:

dulwich/pack.py

@@ -1347,7 +1347,7 @@ class PackStreamReader:
           zlib.error: if an error occurred during zlib decompression.
           IOError: if an error occurred writing to the output file.
         """
-        pack_version, self._num_objects = read_pack_header(self.read)
+        _pack_version, self._num_objects = read_pack_header(self.read)
 
         for _ in range(self._num_objects):
             offset = self.offset
@@ -1535,7 +1535,7 @@ class PackData:
             self._file = GitFile(self._filename, "rb")
         else:
             self._file = file
-        (version, self._num_objects) = read_pack_header(self._file.read)
+        (_version, self._num_objects) = read_pack_header(self._file.read)
 
         # Use delta_cache_size config if available, otherwise default
         cache_size = delta_cache_size or (1024 * 1024 * 20)
@@ -2966,7 +2966,7 @@ class PackChunkGenerator:
             raw: Union[list[bytes], tuple[int, list[bytes]], tuple[bytes, list[bytes]]]
             if unpacked.delta_base is not None:
                 try:
-                    base_offset, base_crc32 = self.entries[unpacked.delta_base]
+                    base_offset, _base_crc32 = self.entries[unpacked.delta_base]
                 except KeyError:
                     type_num = REF_DELTA
                     assert isinstance(unpacked.delta_base, bytes)

dulwich/porcelain.py

@@ -2596,7 +2596,7 @@ def pull(
                         assert lh is not None
                         merge_ref = fetch_result.refs[lh]
                         assert merge_ref is not None
-                        merge_result, conflicts = _do_merge(r, merge_ref)
+                        _merge_result, conflicts = _do_merge(r, merge_ref)
                         if conflicts:
                             raise Error(
                                 f"Merge conflicts occurred: {conflicts}"
@@ -4565,7 +4565,7 @@ def get_object_by_path(
         base_tree = commit.tree
         if not isinstance(path, bytes):
             path = commit_encode(commit, path)
-        (mode, sha) = tree_lookup_path(r.object_store.__getitem__, base_tree, path)
+        (_mode, sha) = tree_lookup_path(r.object_store.__getitem__, base_tree, path)
         obj = r[sha]
         assert isinstance(obj, (Blob, Tree, Commit, Tag))
         return obj

dulwich/rebase.py

@@ -641,7 +641,7 @@ class Rebaser:
         # Get the branch commit
         if branch is None:
             # Use current HEAD
-            head_ref, head_sha = self.repo.refs.follow(b"HEAD")
+            _head_ref, head_sha = self.repo.refs.follow(b"HEAD")
             if head_sha is None:
                 raise ValueError("HEAD does not point to a valid commit")
             branch_commit = self.repo[head_sha]

dulwich/refs.py

@@ -1453,7 +1453,7 @@ def write_info_refs(
             o = store[sha]
         except KeyError:
             continue
-        unpeeled, peeled = peel_sha(store, sha)
+        _unpeeled, peeled = peel_sha(store, sha)
         yield o.id + b"\t" + name + b"\n"
         if o.id != peeled.id:
             yield peeled.id + b"\t" + name + PEELED_TAG_SUFFIX + b"\n"

dulwich/repo.py

@@ -254,7 +254,7 @@ def check_user_identity(identity: bytes) -> None:
       InvalidUserIdentity: Raised when identity is invalid
     """
     try:
-        fst, snd = identity.split(b" <", 1)
+        _fst, snd = identity.split(b" <", 1)
     except ValueError as exc:
         raise InvalidUserIdentity(identity.decode("utf-8", "replace")) from exc
     if b">" not in snd:

dulwich/walk.py

@@ -91,7 +91,7 @@ class WalkEntry:
                 assert isinstance(parent_commit, Commit)
                 parent = parent_commit.tree
                 if path_prefix:
-                    mode, subtree_sha = parent.lookup_path(
+                    _mode, subtree_sha = parent.lookup_path(
                         self._store.__getitem__,
                         path_prefix,
                     )
@@ -122,7 +122,7 @@ class WalkEntry:
                             from .objects import Tree
 
                             assert isinstance(p, Tree)
-                            mode, st = p.lookup_path(
+                            _mode, st = p.lookup_path(
                                 self._store.__getitem__,
                                 path_prefix,
                             )
@@ -136,7 +136,7 @@ class WalkEntry:
                 from .objects import Tree
 
                 assert isinstance(commit_tree, Tree)
-                mode, commit_tree_sha = commit_tree.lookup_path(
+                _mode, commit_tree_sha = commit_tree.lookup_path(
                     self._store.__getitem__,
                     path_prefix,
                 )

tests/compat/server_utils.py

@@ -361,7 +361,7 @@ class NoSideBand64kReceivePackHandler(ReceivePackHandler):
 
 def ignore_error(error):
     """Check whether this error is safe to ignore."""
-    (e_type, e_value, e_tb) = error
+    (e_type, e_value, _e_tb) = error
     return issubclass(e_type, socket.error) and e_value[0] in (
         errno.ECONNRESET,
         errno.EPIPE,

tests/compat/test_commit_graph.py

@@ -119,7 +119,7 @@ class CommitGraphCompatTests(CompatTestCase):
 
     def test_commit_graph_generation_and_reading(self):
         """Test that dulwich can read commit graphs generated by C Git."""
-        commits, work_dir = self.create_test_repo_with_history()
+        _commits, work_dir = self.create_test_repo_with_history()
 
         # Generate commit graph with C Git
         run_git_or_fail(["commit-graph", "write", "--reachable"], cwd=work_dir)
@@ -163,7 +163,7 @@ class CommitGraphCompatTests(CompatTestCase):
 
     def test_merge_base_with_commit_graph(self):
         """Test that merge-base calculations work the same with and without commit graph."""
-        commits, work_dir = self.create_test_repo_with_history()
+        _commits, work_dir = self.create_test_repo_with_history()
 
         repo = Repo(self.repo_path)
         self.addCleanup(repo.close)
@@ -240,7 +240,7 @@ class CommitGraphCompatTests(CompatTestCase):
         # Compare with C Git (check if commit1 is ancestor of commit2)
         from .utils import run_git
 
-        returncode, stdout, stderr = run_git(
+        returncode, _stdout, _stderr = run_git(
             ["merge-base", "--is-ancestor", commit1.decode(), commit2.decode()],
             cwd=work_dir,
             capture_stdout=True,
@@ -256,7 +256,7 @@ class CommitGraphCompatTests(CompatTestCase):
 
     def test_generation_numbers_consistency(self):
         """Test that generation numbers are consistent with Git's topology."""
-        commits, work_dir = self.create_test_repo_with_history()
+        _commits, work_dir = self.create_test_repo_with_history()
 
         # Generate commit graph
         run_git_or_fail(["commit-graph", "write", "--reachable"], cwd=work_dir)
@@ -355,7 +355,7 @@ class CommitGraphCompatTests(CompatTestCase):
 
     def test_commit_graph_incremental_update(self):
         """Test that dulwich can read incrementally updated commit graphs."""
-        commits, work_dir = self.create_test_repo_with_history()
+        _commits, work_dir = self.create_test_repo_with_history()
 
         # Create initial commit graph
         run_git_or_fail(["commit-graph", "write", "--reachable"], cwd=work_dir)

tests/compat/test_index.py

@@ -171,7 +171,7 @@ class IndexV4CompatTestCase(CompatTestCase):
         # Read the index
         index_path = os.path.join(repo.path, ".git", "index")
         with open(index_path, "rb") as f:
-            entries, version, extensions = read_index_dict_with_version(f)
+            entries, version, _extensions = read_index_dict_with_version(f)
 
         self.assertEqual(version, 4)
         self.assertIn(b"test.txt", entries)
@@ -341,7 +341,7 @@ class IndexV4CompatTestCase(CompatTestCase):
         # Read index with extensions
         index_path = os.path.join(repo.path, ".git", "index")
         with open(index_path, "rb") as f:
-            entries, version, extensions = read_index_dict_with_version(f)
+            entries, version, _extensions = read_index_dict_with_version(f)
 
         self.assertEqual(version, 4)
         self.assertEqual(len(entries), len(files))
@@ -406,7 +406,7 @@ class IndexV4CompatTestCase(CompatTestCase):
         # Read index
         index_path = os.path.join(repo.path, ".git", "index")
         with open(index_path, "rb") as f:
-            entries, version, extensions = read_index_dict_with_version(f)
+            entries, version, _extensions = read_index_dict_with_version(f)
 
         self.assertEqual(version, 4)
         self.assertEqual(len(entries), len(files))
@@ -449,7 +449,7 @@ class IndexV4CompatTestCase(CompatTestCase):
         # Test dulwich can read the updated index
         index_path = os.path.join(repo.path, ".git", "index")
         with open(index_path, "rb") as f:
-            entries, version, extensions = read_index_dict_with_version(f)
+            entries, version, _extensions = read_index_dict_with_version(f)
 
         self.assertEqual(version, 4)
         self.assertEqual(len(entries), 4)  # 3 original + 1 new
@@ -502,7 +502,7 @@ class IndexV4CompatTestCase(CompatTestCase):
         index_path = os.path.join(repo.path, ".git", "index")
         if os.path.exists(index_path):
             with open(index_path, "rb") as f:
-                entries, version, extensions = read_index_dict_with_version(f)
+                _entries, version, _extensions = read_index_dict_with_version(f)
 
             self.assertEqual(version, 4)
 
@@ -565,7 +565,7 @@ class IndexV4CompatTestCase(CompatTestCase):
             # Test reading
             index_path = os.path.join(repo.path, ".git", "index")
             with open(index_path, "rb") as f:
-                entries, version, extensions = read_index_dict_with_version(f)
+                _entries, version, _extensions = read_index_dict_with_version(f)
 
             self.assertEqual(version, 4)
 
@@ -619,7 +619,7 @@ class IndexV4CompatTestCase(CompatTestCase):
             # Test reading
             index_path = os.path.join(repo.path, ".git", "index")
             with open(index_path, "rb") as f:
-                entries, version, extensions = read_index_dict_with_version(f)
+                entries, version, _extensions = read_index_dict_with_version(f)
 
             self.assertEqual(version, 4)
             self.assertGreater(len(entries), 0)
@@ -658,7 +658,7 @@ class IndexV4CompatTestCase(CompatTestCase):
         # Test reading
         index_path = os.path.join(repo.path, ".git", "index")
         with open(index_path, "rb") as f:
-            entries, version, extensions = read_index_dict_with_version(f)
+            entries, version, _extensions = read_index_dict_with_version(f)
 
         self.assertEqual(version, 4)
 
@@ -715,7 +715,7 @@ class IndexV4CompatTestCase(CompatTestCase):
         # Test reading
         index_path = os.path.join(repo.path, ".git", "index")
         with open(index_path, "rb") as f:
-            entries, version, extensions = read_index_dict_with_version(f)
+            entries, version, _extensions = read_index_dict_with_version(f)
 
         self.assertEqual(version, 4)
         self.assertEqual(len(entries), len(files))
@@ -756,7 +756,7 @@ class IndexV4CompatTestCase(CompatTestCase):
         # Test reading index with submodule
         index_path = os.path.join(repo.path, ".git", "index")
         with open(index_path, "rb") as f:
-            entries, version, extensions = read_index_dict_with_version(f)
+            entries, version, _extensions = read_index_dict_with_version(f)
 
         self.assertEqual(version, 4)
 
@@ -799,7 +799,7 @@ class IndexV4CompatTestCase(CompatTestCase):
         # Test reading this complex index state
         index_path = os.path.join(repo.path, ".git", "index")
         with open(index_path, "rb") as f:
-            entries, version, extensions = read_index_dict_with_version(f)
+            entries, version, _extensions = read_index_dict_with_version(f)
 
         self.assertEqual(version, 4)
         self.assertIn(b"partial.txt", entries)
@@ -846,7 +846,7 @@ class IndexV4CompatTestCase(CompatTestCase):
         # Test reading
         index_path = os.path.join(repo.path, ".git", "index")
         with open(index_path, "rb") as f:
-            entries, version, extensions = read_index_dict_with_version(f)
+            entries, version, _extensions = read_index_dict_with_version(f)
 
         self.assertEqual(version, 4)
 
@@ -912,7 +912,7 @@ class IndexV4CompatTestCase(CompatTestCase):
         # Test reading large index
         index_path = os.path.join(repo.path, ".git", "index")
         with open(index_path, "rb") as f:
-            entries, version, extensions = read_index_dict_with_version(f)
+            entries, version, _extensions = read_index_dict_with_version(f)
 
         self.assertEqual(version, 4)
         self.assertEqual(len(entries), len(files))
@@ -952,7 +952,7 @@ class IndexV4CompatTestCase(CompatTestCase):
         # Test reading index with renames
         index_path = os.path.join(repo.path, ".git", "index")
         with open(index_path, "rb") as f:
-            entries, version, extensions = read_index_dict_with_version(f)
+            entries, version, _extensions = read_index_dict_with_version(f)
 
         self.assertEqual(version, 4)
 

tests/compat/test_lfs.py

@@ -188,7 +188,7 @@ class LFSFileOperationsCompatTest(LFSCompatTestCase):
         repo = porcelain.open_repo(repo_dir)
         self.addCleanup(repo.close)
         tree = repo[repo.head()].tree
-        mode, sha = repo.object_store[tree][b"test.bin"]
+        _mode, sha = repo.object_store[tree][b"test.bin"]
         blob = repo.object_store[sha]
         pointer = LFSPointer.from_bytes(blob.data)
         self.assertEqual(pointer.size, 1048576)

tests/compat/test_porcelain.py

@@ -43,7 +43,7 @@ except ImportError:
 class TagCreateSignTestCase(PorcelainGpgTestCase, CompatTestCase):
     def test_sign(self) -> None:
         # Test that dulwich signatures can be verified by CGit
-        c1, c2, c3 = build_commit_graph(
+        _c1, _c2, c3 = build_commit_graph(
             self.repo.object_store, [[1], [2, 1], [3, 1, 2]]
         )
         self.repo.refs[b"HEAD"] = c3.id
@@ -67,7 +67,7 @@ class TagCreateSignTestCase(PorcelainGpgTestCase, CompatTestCase):
 
     def test_verify(self) -> None:
         # Test that CGit signatures can be verified by dulwich
-        c1, c2, c3 = build_commit_graph(
+        _c1, _c2, c3 = build_commit_graph(
             self.repo.object_store, [[1], [2, 1], [3, 1, 2]]
         )
         self.repo.refs[b"HEAD"] = c3.id

tests/compat/test_reftable.py

@@ -140,7 +140,7 @@ class ReftableCompatTestCase(CompatTestCase):
 
     def test_git_creates_valid_reftable_format(self):
         """Test that git creates reftable files with valid format."""
-        sha1, sha2 = self._create_git_repo_with_reftable()
+        _sha1, _sha2 = self._create_git_repo_with_reftable()
 
         # Check that reftable files were created
         reftable_files = self._get_reftable_files()
@@ -292,7 +292,7 @@ class ReftableCompatTestCase(CompatTestCase):
 
     def test_multiple_table_files_compatibility(self):
         """Test compatibility when multiple reftable files exist."""
-        sha1, sha2 = self._create_git_repo_with_reftable()
+        _sha1, _sha2 = self._create_git_repo_with_reftable()
 
         # Add more refs to potentially create multiple table files
         for i in range(10):

tests/contrib/test_paramiko_vendor.py

@@ -124,7 +124,7 @@ else:
 
             while self.running:
                 try:
-                    client_socket, addr = self.server_socket.accept()
+                    client_socket, _addr = self.server_socket.accept()
 
                     # Handle each connection in a separate thread
                     conn_thread = threading.Thread(
@@ -286,7 +286,7 @@ class ParamikoSSHVendorTests(TestCase):
 
     def _run(self) -> Optional[bool]:
         try:
-            conn, addr = self.socket.accept()
+            conn, _addr = self.socket.accept()
         except OSError:
             return False
         self.transport = paramiko.Transport(conn)

tests/test_archive.py

@@ -38,7 +38,7 @@ from . import TestCase
 class ArchiveTests(TestCase):
     def test_empty(self) -> None:
         store = MemoryObjectStore()
-        c1, c2, c3 = build_commit_graph(store, [[1], [2, 1], [3, 1, 2]])
+        _c1, _c2, c3 = build_commit_graph(store, [[1], [2, 1], [3, 1, 2]])
         tree = store[c3.tree]
         stream = b"".join(tar_stream(store, tree, 10))
         out = BytesIO(stream)

tests/test_blackbox.py

@@ -40,7 +40,7 @@ class GitReceivePackTests(BlackboxTestCase):
 
     def test_basic(self) -> None:
         process = self.run_command("dul-receive-pack", [self.path])
-        (stdout, stderr) = process.communicate(b"0000")
+        (stdout, _stderr) = process.communicate(b"0000")
         self.assertEqual(b"0000", stdout[-4:])
         self.assertEqual(0, process.returncode)
 

tests/test_client.py

@@ -548,7 +548,7 @@ class TestGetTransportAndPath(TestCase):
         from dulwich.config import ConfigDict
 
         config = ConfigDict()
-        c, path = get_transport_and_path(
+        c, _path = get_transport_and_path(
             "ssh://git@github.com/user/repo.git", config=config
         )
         self.assertIsInstance(c, SSHGitClient)
@@ -556,14 +556,14 @@ class TestGetTransportAndPath(TestCase):
 
         config.set((b"core",), b"sshCommand", b"custom-ssh -o CustomOption=yes")
 
-        c, path = get_transport_and_path(
+        c, _path = get_transport_and_path(
             "ssh://git@github.com/user/repo.git", config=config
         )
         self.assertIsInstance(c, SSHGitClient)
         self.assertEqual("custom-ssh -o CustomOption=yes", c.ssh_command)
 
         # Test rsync-style URL also gets the config
-        c, path = get_transport_and_path("git@github.com:user/repo.git", config=config)
+        c, _path = get_transport_and_path("git@github.com:user/repo.git", config=config)
         self.assertIsInstance(c, SSHGitClient)
         self.assertEqual("custom-ssh -o CustomOption=yes", c.ssh_command)
 
@@ -576,7 +576,7 @@ class TestGetTransportAndPath(TestCase):
     def test_error(self) -> None:
         # Need to use a known urlparse.uses_netloc URL scheme to get the
         # expected parsing of the URL on Python versions less than 2.6.5
-        c, path = get_transport_and_path("prospero://bar/baz")
+        c, _path = get_transport_and_path("prospero://bar/baz")
         self.assertIsInstance(c, SSHGitClient)
 
     def test_http(self) -> None:
@@ -1106,7 +1106,7 @@ class BundleClientTests(TestCase):
 
     def test_fetch_pack(self) -> None:
         """Test fetching pack from bundle."""
-        bundle_path, source_repo = self._create_test_bundle()
+        bundle_path, _source_repo = self._create_test_bundle()
 
         client = BundleClient()
         pack_data = BytesIO()
@@ -1133,7 +1133,7 @@ class BundleClientTests(TestCase):
 
     def test_fetch(self) -> None:
         """Test fetching from bundle into target repo."""
-        bundle_path, source_repo = self._create_test_bundle()
+        bundle_path, _source_repo = self._create_test_bundle()
 
         client = BundleClient()
         target_repo = MemoryRepo()

tests/test_fastexport.py

@@ -103,7 +103,7 @@ class GitImportProcessorTests(TestCase):
     def test_reset_handler_marker(self) -> None:
         from fastimport import commands
 
-        [c1, c2] = build_commit_graph(self.repo.object_store, [[1], [2]])
+        [c1, _c2] = build_commit_graph(self.repo.object_store, [[1], [2]])
         self.processor.markers[b"10"] = c1.id
         cmd = commands.ResetCommand(b"refs/heads/foo", b":10")
         self.processor.reset_handler(cmd)
@@ -112,7 +112,7 @@ class GitImportProcessorTests(TestCase):
     def test_reset_handler_default(self) -> None:
         from fastimport import commands
 
-        [c1, c2] = build_commit_graph(self.repo.object_store, [[1], [2]])
+        [_c1, _c2] = build_commit_graph(self.repo.object_store, [[1], [2]])
         cmd = commands.ResetCommand(b"refs/heads/foo", None)
         self.processor.reset_handler(cmd)
         self.assertEqual(ZERO_SHA, self.repo.get_refs()[b"refs/heads/foo"])

tests/test_index.py

@@ -140,7 +140,7 @@ class SimpleIndexTestCase(IndexTestCase):
         i = self.get_simple_index("index")
         changes = list(i.changes_from_tree(MemoryObjectStore(), None))
         self.assertEqual(1, len(changes))
-        (oldname, newname), (oldmode, newmode), (oldsha, newsha) = changes[0]
+        (_oldname, newname), (_oldmode, _newmode), (_oldsha, newsha) = changes[0]
         self.assertEqual(b"bla", newname)
         self.assertEqual(b"e69de29bb2d1d6434b8b29ae775ad8c2e48c5391", newsha)
 

tests/test_merge.py

@@ -144,7 +144,7 @@ class MergeTests(unittest.TestCase):
         self.repo.object_store.add_object(modified_blob)
 
         # We delete, they modify
-        result, has_conflicts = self.merger.merge_blobs(base_blob, None, modified_blob)
+        _result, has_conflicts = self.merger.merge_blobs(base_blob, None, modified_blob)
         self.assertTrue(has_conflicts)
 
     def test_merge_blobs_no_base(self):
@@ -225,7 +225,7 @@ class MergeTests(unittest.TestCase):
         self.repo.object_store.add_object(theirs_tree)
 
         # Merge
-        merged_tree, conflicts = self.merger.merge_trees(
+        _merged_tree, conflicts = self.merger.merge_trees(
             base_tree, ours_tree, theirs_tree
         )
 
@@ -285,7 +285,7 @@ class MergeTests(unittest.TestCase):
         self.repo.object_store.add_object(theirs_commit)
 
         # Perform three-way merge
-        merged_tree, conflicts = three_way_merge(
+        _merged_tree, conflicts = three_way_merge(
             self.repo.object_store, base_commit, ours_commit, theirs_commit
         )
 

tests/test_object_store.py

@@ -84,7 +84,7 @@ class MemoryObjectStoreTests(ObjectStoreTests, TestCase):
 
     def test_add_pack_emtpy(self) -> None:
         o = MemoryObjectStore()
-        f, commit, abort = o.add_pack()
+        _f, commit, _abort = o.add_pack()
         commit()
 
     def test_add_thin_pack(self) -> None:
@@ -248,7 +248,7 @@ class DiskObjectStoreTests(PackBasedObjectStoreTests, TestCase):
             dirname = os.path.join(self.store_dir, f"{i:02x}")
             if not os.path.isdir(dirname):
                 os.makedirs(dirname)
-            fd, n = tempfile.mkstemp(prefix="tmp_obj_", dir=dirname)
+            fd, _n = tempfile.mkstemp(prefix="tmp_obj_", dir=dirname)
             os.close(fd)
 
         self.assertEqual([testobject.id], list(self.store._iter_loose_objects()))

tests/test_objectspec.py

@@ -70,7 +70,7 @@ class ParseObjectTests(TestCase):
 
     def test_combined_operators(self) -> None:
         r = MemoryRepo()
-        c1, c2, c3, c4 = build_commit_graph(
+        c1, c2, _c3, c4 = build_commit_graph(
             r.object_store, [[1], [2, 1], [3, 1, 2], [4, 3]]
         )
         # c4~1^2 means: go back 1 generation from c4 (to c3), then take its 2nd parent
@@ -256,12 +256,12 @@ class ParseCommitRangeTests(TestCase):
 
     def test_commit_by_sha(self) -> None:
         r = MemoryRepo()
-        c1, c2, c3 = build_commit_graph(r.object_store, [[1], [2, 1], [3, 1, 2]])
+        c1, _c2, _c3 = build_commit_graph(r.object_store, [[1], [2, 1], [3, 1, 2]])
         self.assertIsNone(parse_commit_range(r, c1.id))
 
     def test_commit_range(self) -> None:
         r = MemoryRepo()
-        c1, c2, c3 = build_commit_graph(r.object_store, [[1], [2, 1], [3, 1, 2]])
+        c1, c2, _c3 = build_commit_graph(r.object_store, [[1], [2, 1], [3, 1, 2]])
         result = parse_commit_range(r, f"{c1.id.decode()}..{c2.id.decode()}")
         self.assertIsNotNone(result)
         start_commit, end_commit = result
@@ -534,13 +534,13 @@ class ParseTreeTests(TestCase):
 
     def test_from_commit(self) -> None:
         r = MemoryRepo()
-        c1, c2, c3 = build_commit_graph(r.object_store, [[1], [2, 1], [3, 1, 2]])
+        c1, _c2, _c3 = build_commit_graph(r.object_store, [[1], [2, 1], [3, 1, 2]])
         self.assertEqual(r[c1.tree], parse_tree(r, c1.id))
         self.assertEqual(r[c1.tree], parse_tree(r, c1.tree))
 
     def test_from_ref(self) -> None:
         r = MemoryRepo()
-        c1, c2, c3 = build_commit_graph(r.object_store, [[1], [2, 1], [3, 1, 2]])
+        c1, _c2, _c3 = build_commit_graph(r.object_store, [[1], [2, 1], [3, 1, 2]])
         r.refs[b"refs/heads/foo"] = c1.id
         self.assertEqual(r[c1.tree], parse_tree(r, b"foo"))
 

tests/test_patch.py

@@ -156,7 +156,7 @@ Subject:  [Dulwich-users] [PATCH] Added unit tests for
 -- 
 1.7.0.4
 """
-        c, diff, version = git_am_patch_split(BytesIO(text), "utf-8")
+        c, _diff, _version = git_am_patch_split(BytesIO(text), "utf-8")
         self.assertEqual(
             b"""\
 Added unit tests for dulwich.object_store.tree_lookup_path.
@@ -188,7 +188,7 @@ From: Jelmer Vernooij <jelmer@debian.org>
 -- 
 1.7.0.4
 """
-        c, diff, version = git_am_patch_split(BytesIO(text), "utf-8")
+        c, _diff, _version = git_am_patch_split(BytesIO(text), "utf-8")
         self.assertEqual(b"Jelmer Vernooij <jelmer@debian.org>", c.author)
         self.assertEqual(
             b"""\
@@ -217,7 +217,7 @@ From: Jelmer Vernooij <jelmer@debian.org>
  mode change 100755 => 100644 pixmaps/prey.ico
 
 """
-        c, diff, version = git_am_patch_split(BytesIO(text), "utf-8")
+        _c, _diff, version = git_am_patch_split(BytesIO(text), "utf-8")
         self.assertEqual(None, version)
 
     def test_extract_mercurial(self) -> NoReturn:
@@ -258,7 +258,7 @@ Unsubscribe : https://launchpad.net/~dulwich-users
 More help   : https://help.launchpad.net/ListHelp
 
 """
-        c, diff, version = git_am_patch_split(BytesIO(text))
+        _c, diff, version = git_am_patch_split(BytesIO(text))
         self.assertEqual(expected_diff, diff)
         self.assertEqual(None, version)
 

tests/test_porcelain.py

@@ -300,7 +300,7 @@ class ArchiveTests(PorcelainTestCase):
     """Tests for the archive command."""
 
     def test_simple(self) -> None:
-        c1, c2, c3 = build_commit_graph(
+        _c1, _c2, c3 = build_commit_graph(
             self.repo.object_store, [[1], [2, 1], [3, 1, 2]]
         )
         self.repo.refs[b"refs/heads/master"] = c3.id
@@ -317,7 +317,7 @@ class ArchiveTests(PorcelainTestCase):
 
 class UpdateServerInfoTests(PorcelainTestCase):
     def test_simple(self) -> None:
-        c1, c2, c3 = build_commit_graph(
+        _c1, _c2, c3 = build_commit_graph(
             self.repo.object_store, [[1], [2, 1], [3, 1, 2]]
         )
         self.repo.refs[b"refs/heads/foo"] = c3.id
@@ -329,7 +329,7 @@ class UpdateServerInfoTests(PorcelainTestCase):
 
 class CommitTests(PorcelainTestCase):
     def test_custom_author(self) -> None:
-        c1, c2, c3 = build_commit_graph(
+        _c1, _c2, c3 = build_commit_graph(
             self.repo.object_store, [[1], [2, 1], [3, 1, 2]]
         )
         self.repo.refs[b"refs/heads/foo"] = c3.id
@@ -343,7 +343,7 @@ class CommitTests(PorcelainTestCase):
         self.assertEqual(len(sha), 40)
 
     def test_unicode(self) -> None:
-        c1, c2, c3 = build_commit_graph(
+        _c1, _c2, c3 = build_commit_graph(
             self.repo.object_store, [[1], [2, 1], [3, 1, 2]]
         )
         self.repo.refs[b"refs/heads/foo"] = c3.id
@@ -365,7 +365,7 @@ class CommitTests(PorcelainTestCase):
         os.makedirs(hooks_dir, exist_ok=True)
         self.addCleanup(shutil.rmtree, hooks_dir)
 
-        c1, c2, c3 = build_commit_graph(
+        _c1, _c2, _c3 = build_commit_graph(
             self.repo.object_store, [[1], [2, 1], [3, 1, 2]]
         )
 
@@ -411,7 +411,7 @@ class CommitTests(PorcelainTestCase):
         self.assertEqual(len(sha), 40)
 
     def test_timezone(self) -> None:
-        c1, c2, c3 = build_commit_graph(
+        _c1, _c2, c3 = build_commit_graph(
             self.repo.object_store, [[1], [2, 1], [3, 1, 2]]
         )
         self.repo.refs[b"refs/heads/foo"] = c3.id
@@ -612,7 +612,7 @@ class CommitTests(PorcelainTestCase):
 )
 class CommitSignTests(PorcelainGpgTestCase):
     def test_default_key(self) -> None:
-        c1, c2, c3 = build_commit_graph(
+        _c1, _c2, c3 = build_commit_graph(
             self.repo.object_store, [[1], [2, 1], [3, 1, 2]]
         )
         self.repo.refs[b"HEAD"] = c3.id
@@ -651,7 +651,7 @@ class CommitSignTests(PorcelainGpgTestCase):
         )
 
     def test_non_default_key(self) -> None:
-        c1, c2, c3 = build_commit_graph(
+        _c1, _c2, c3 = build_commit_graph(
             self.repo.object_store, [[1], [2, 1], [3, 1, 2]]
         )
         self.repo.refs[b"HEAD"] = c3.id
@@ -676,7 +676,7 @@ class CommitSignTests(PorcelainGpgTestCase):
 
     def test_sign_uses_config_signingkey(self) -> None:
         """Test that sign=True uses user.signingKey from config."""
-        c1, c2, c3 = build_commit_graph(
+        _c1, _c2, c3 = build_commit_graph(
             self.repo.object_store, [[1], [2, 1], [3, 1, 2]]
         )
         self.repo.refs[b"HEAD"] = c3.id
@@ -708,7 +708,7 @@ class CommitSignTests(PorcelainGpgTestCase):
 
     def test_commit_gpg_sign_config_enabled(self) -> None:
         """Test that commit.gpgSign=true automatically signs commits."""
-        c1, c2, c3 = build_commit_graph(
+        _c1, _c2, c3 = build_commit_graph(
             self.repo.object_store, [[1], [2, 1], [3, 1, 2]]
         )
         self.repo.refs[b"HEAD"] = c3.id
@@ -741,7 +741,7 @@ class CommitSignTests(PorcelainGpgTestCase):
 
     def test_commit_gpg_sign_config_disabled(self) -> None:
         """Test that commit.gpgSign=false does not sign commits."""
-        c1, c2, c3 = build_commit_graph(
+        _c1, _c2, c3 = build_commit_graph(
             self.repo.object_store, [[1], [2, 1], [3, 1, 2]]
         )
         self.repo.refs[b"HEAD"] = c3.id
@@ -773,7 +773,7 @@ class CommitSignTests(PorcelainGpgTestCase):
 
     def test_commit_gpg_sign_config_no_signing_key(self) -> None:
         """Test that commit.gpgSign=true works without user.signingKey (uses default)."""
-        c1, c2, c3 = build_commit_graph(
+        _c1, _c2, c3 = build_commit_graph(
             self.repo.object_store, [[1], [2, 1], [3, 1, 2]]
         )
         self.repo.refs[b"HEAD"] = c3.id
@@ -804,7 +804,7 @@ class CommitSignTests(PorcelainGpgTestCase):
 
     def test_explicit_signoff_overrides_config(self) -> None:
         """Test that explicit signoff parameter overrides commit.gpgSign config."""
-        c1, c2, c3 = build_commit_graph(
+        _c1, _c2, c3 = build_commit_graph(
             self.repo.object_store, [[1], [2, 1], [3, 1, 2]]
         )
         self.repo.refs[b"HEAD"] = c3.id
@@ -837,7 +837,7 @@ class CommitSignTests(PorcelainGpgTestCase):
 
     def test_explicit_false_disables_signing(self) -> None:
         """Test that explicit signoff=False disables signing even with config=true."""
-        c1, c2, c3 = build_commit_graph(
+        _c1, _c2, c3 = build_commit_graph(
             self.repo.object_store, [[1], [2, 1], [3, 1, 2]]
         )
         self.repo.refs[b"HEAD"] = c3.id
@@ -1049,7 +1049,7 @@ class CloneTests(PorcelainTestCase):
             3: [(b"f1", f1_1), (b"f2", f1_1)],
         }
 
-        c1, c2, c3 = build_commit_graph(self.repo.object_store, commit_spec, trees)
+        _c1, _c2, c3 = build_commit_graph(self.repo.object_store, commit_spec, trees)
         self.repo.refs[b"refs/heads/master"] = c3.id
         self.repo.refs[b"refs/tags/foo"] = c3.id
         target_path = tempfile.mkdtemp()
@@ -1087,7 +1087,7 @@ class CloneTests(PorcelainTestCase):
             3: [(b"f1", f1_1), (b"f2", f1_1)],
         }
 
-        c1, c2, c3 = build_commit_graph(self.repo.object_store, commit_spec, trees)
+        _c1, _c2, c3 = build_commit_graph(self.repo.object_store, commit_spec, trees)
         self.repo.refs[b"refs/heads/master"] = c3.id
         target_path = tempfile.mkdtemp()
         errstream = BytesIO()
@@ -1110,7 +1110,7 @@ class CloneTests(PorcelainTestCase):
             3: [(b"f1", f1_1), (b"f2", f1_1)],
         }
 
-        c1, c2, c3 = build_commit_graph(self.repo.object_store, commit_spec, trees)
+        _c1, _c2, c3 = build_commit_graph(self.repo.object_store, commit_spec, trees)
         self.repo.refs[b"refs/heads/master"] = c3.id
         target_path = tempfile.mkdtemp()
         errstream = BytesIO()
@@ -1220,7 +1220,7 @@ class CloneTests(PorcelainTestCase):
             3: [(b"f1", f1_1), (b"f2", f1_1)],
         }
 
-        c1, c2, c3 = build_commit_graph(self.repo.object_store, commit_spec, trees)
+        _c1, c2, c3 = build_commit_graph(self.repo.object_store, commit_spec, trees)
         self.repo.refs[b"refs/heads/master"] = c2.id
         self.repo.refs.remove_if_equals(b"HEAD", None)
         self.repo.refs[b"HEAD"] = c3.id
@@ -1477,7 +1477,7 @@ class AddTests(PorcelainTestCase):
         try:
             os.chdir(build_dir)
             # Add file using absolute path from within ignored directory
-            (added, ignored) = porcelain.add(self.repo.path, paths=[src_file])
+            (added, _ignored) = porcelain.add(self.repo.path, paths=[src_file])
             self.assertIn(b"source.py", self.repo.open_index())
             self.assertEqual({"source.py"}, set(added))
         finally:
@@ -1620,7 +1620,7 @@ class AddTests(PorcelainTestCase):
         os.symlink("link1", second_link)
 
         # Add all files
-        added, ignored = porcelain.add(
+        added, _ignored = porcelain.add(
             self.repo.path, paths=[target_file, first_link, second_link]
         )
 
@@ -1711,7 +1711,7 @@ class AddTests(PorcelainTestCase):
         symlink_file_path = os.path.join(link_dir, "file.txt")
 
         # This should add the real file, not create a new entry
-        added, ignored = porcelain.add(self.repo.path, paths=[symlink_file_path])
+        added, _ignored = porcelain.add(self.repo.path, paths=[symlink_file_path])
 
         # The real file should be added
         self.assertIn("real_dir/file.txt", added)
@@ -1732,7 +1732,7 @@ class AddTests(PorcelainTestCase):
             f.write("content2")
 
         # Add the repository path itself
-        added, ignored = porcelain.add(self.repo.path, paths=[self.repo.path])
+        added, _ignored = porcelain.add(self.repo.path, paths=[self.repo.path])
 
         # Should add all untracked files, not stage './'
         self.assertIn("file1.txt", added)
@@ -1757,7 +1757,7 @@ class AddTests(PorcelainTestCase):
             f.write("content3")
 
         # Add the directory
-        added, ignored = porcelain.add(self.repo.path, paths=["subdir"])
+        added, _ignored = porcelain.add(self.repo.path, paths=["subdir"])
 
         # Should add all files in the directory
         self.assertEqual(len(added), 3)
@@ -1790,7 +1790,7 @@ class AddTests(PorcelainTestCase):
             f.write("level3")
 
         # Add the top-level directory
-        added, ignored = porcelain.add(self.repo.path, paths=["dir1"])
+        added, _ignored = porcelain.add(self.repo.path, paths=["dir1"])
 
         # Should add all files recursively
         self.assertEqual(len(added), 3)
@@ -1831,7 +1831,7 @@ class AddTests(PorcelainTestCase):
             f.write("new file 2")
 
         # Add the directory
-        added, ignored = porcelain.add(self.repo.path, paths=["mixed"])
+        added, _ignored = porcelain.add(self.repo.path, paths=["mixed"])
 
         # Should only add the untracked files
         self.assertEqual(len(added), 2)
@@ -1902,7 +1902,7 @@ class AddTests(PorcelainTestCase):
                     f.write(f"content {dirname} {i}")
 
         # Add all directories at once
-        added, ignored = porcelain.add(self.repo.path, paths=["dir1", "dir2", "dir3"])
+        added, _ignored = porcelain.add(self.repo.path, paths=["dir1", "dir2", "dir3"])
 
         # Should add all files from all directories
         self.assertEqual(len(added), 6)
@@ -2261,7 +2261,7 @@ class MvTests(PorcelainTestCase):
 
 class LogTests(PorcelainTestCase):
     def test_simple(self) -> None:
-        c1, c2, c3 = build_commit_graph(
+        _c1, _c2, c3 = build_commit_graph(
             self.repo.object_store, [[1], [2, 1], [3, 1, 2]]
         )
         self.repo.refs[b"HEAD"] = c3.id
@@ -2300,7 +2300,7 @@ Commit 1
         )
 
     def test_max_entries(self) -> None:
-        c1, c2, c3 = build_commit_graph(
+        _c1, _c2, c3 = build_commit_graph(
             self.repo.object_store, [[1], [2, 1], [3, 1, 2]]
         )
         self.repo.refs[b"HEAD"] = c3.id
@@ -2333,7 +2333,7 @@ Date:   Fri Jan 01 2010 00:00:00 +0000
 
 class ShowTests(PorcelainTestCase):
     def test_nolist(self) -> None:
-        c1, c2, c3 = build_commit_graph(
+        _c1, _c2, c3 = build_commit_graph(
             self.repo.object_store, [[1], [2, 1], [3, 1, 2]]
         )
         self.repo.refs[b"HEAD"] = c3.id
@@ -2342,7 +2342,7 @@ class ShowTests(PorcelainTestCase):
         self.assertTrue(outstream.getvalue().startswith("-" * 50))
 
     def test_simple(self) -> None:
-        c1, c2, c3 = build_commit_graph(
+        _c1, _c2, c3 = build_commit_graph(
             self.repo.object_store, [[1], [2, 1], [3, 1, 2]]
         )
         self.repo.refs[b"HEAD"] = c3.id
@@ -2599,7 +2599,7 @@ class FormatPatchTests(PorcelainTestCase):
 
     def test_format_patch_range(self) -> None:
         # Create commit chain
-        c1, c2, c3 = build_commit_graph(self.repo.object_store, [[1], [2, 1], [3, 2]])
+        c1, _c2, c3 = build_commit_graph(self.repo.object_store, [[1], [2, 1], [3, 2]])
         self.repo[b"HEAD"] = c3.id
 
         # Test commit range
@@ -2655,7 +2655,7 @@ class FormatPatchTests(PorcelainTestCase):
 
 class SymbolicRefTests(PorcelainTestCase):
     def test_set_wrong_symbolic_ref(self) -> None:
-        c1, c2, c3 = build_commit_graph(
+        _c1, _c2, c3 = build_commit_graph(
             self.repo.object_store, [[1], [2, 1], [3, 1, 2]]
         )
         self.repo.refs[b"HEAD"] = c3.id
@@ -2665,7 +2665,7 @@ class SymbolicRefTests(PorcelainTestCase):
         )
 
     def test_set_force_wrong_symbolic_ref(self) -> None:
-        c1, c2, c3 = build_commit_graph(
+        _c1, _c2, c3 = build_commit_graph(
             self.repo.object_store, [[1], [2, 1], [3, 1, 2]]
         )
         self.repo.refs[b"HEAD"] = c3.id
@@ -2678,7 +2678,7 @@ class SymbolicRefTests(PorcelainTestCase):
         self.assertEqual(new_ref, b"ref: refs/heads/force_foobar\n")
 
     def test_set_symbolic_ref(self) -> None:
-        c1, c2, c3 = build_commit_graph(
+        _c1, _c2, c3 = build_commit_graph(
             self.repo.object_store, [[1], [2, 1], [3, 1, 2]]
         )
         self.repo.refs[b"HEAD"] = c3.id
@@ -2686,7 +2686,7 @@ class SymbolicRefTests(PorcelainTestCase):
         porcelain.symbolic_ref(self.repo.path, b"master")
 
     def test_set_symbolic_ref_other_than_master(self) -> None:
-        c1, c2, c3 = build_commit_graph(
+        _c1, _c2, c3 = build_commit_graph(
             self.repo.object_store,
             [[1], [2, 1], [3, 1, 2]],
             attrs=dict(refs="develop"),
@@ -2704,7 +2704,7 @@ class SymbolicRefTests(PorcelainTestCase):
 
 class DiffTreeTests(PorcelainTestCase):
     def test_empty(self) -> None:
-        c1, c2, c3 = build_commit_graph(
+        _c1, c2, c3 = build_commit_graph(
             self.repo.object_store, [[1], [2, 1], [3, 1, 2]]
         )
         self.repo.refs[b"HEAD"] = c3.id
@@ -2982,7 +2982,7 @@ class DiffTests(PorcelainTestCase):
 
 class CommitTreeTests(PorcelainTestCase):
     def test_simple(self) -> None:
-        c1, c2, c3 = build_commit_graph(
+        _c1, _c2, _c3 = build_commit_graph(
             self.repo.object_store, [[1], [2, 1], [3, 1, 2]]
         )
         b = Blob()
@@ -3020,7 +3020,7 @@ class RevListTests(PorcelainTestCase):
 )
 class TagCreateSignTests(PorcelainGpgTestCase):
     def test_default_key(self) -> None:
-        c1, c2, c3 = build_commit_graph(
+        _c1, _c2, c3 = build_commit_graph(
             self.repo.object_store, [[1], [2, 1], [3, 1, 2]]
         )
         self.repo.refs[b"HEAD"] = c3.id
@@ -3065,7 +3065,7 @@ class TagCreateSignTests(PorcelainGpgTestCase):
         )
 
     def test_non_default_key(self) -> None:
-        c1, c2, c3 = build_commit_graph(
+        _c1, _c2, c3 = build_commit_graph(
             self.repo.object_store, [[1], [2, 1], [3, 1, 2]]
         )
         self.repo.refs[b"HEAD"] = c3.id
@@ -3096,7 +3096,7 @@ class TagCreateSignTests(PorcelainGpgTestCase):
 
     def test_sign_uses_config_signingkey(self) -> None:
         """Test that sign=True uses user.signingKey from config."""
-        c1, c2, c3 = build_commit_graph(
+        _c1, _c2, c3 = build_commit_graph(
             self.repo.object_store, [[1], [2, 1], [3, 1, 2]]
         )
         self.repo.refs[b"HEAD"] = c3.id
@@ -3129,7 +3129,7 @@ class TagCreateSignTests(PorcelainGpgTestCase):
 
     def test_tag_gpg_sign_config_enabled(self) -> None:
         """Test that tag.gpgSign=true automatically signs tags."""
-        c1, c2, c3 = build_commit_graph(
+        _c1, _c2, c3 = build_commit_graph(
             self.repo.object_store, [[1], [2, 1], [3, 1, 2]]
         )
         self.repo.refs[b"HEAD"] = c3.id
@@ -3163,7 +3163,7 @@ class TagCreateSignTests(PorcelainGpgTestCase):
 
     def test_tag_gpg_sign_config_disabled(self) -> None:
         """Test that tag.gpgSign=false does not sign tags."""
-        c1, c2, c3 = build_commit_graph(
+        _c1, _c2, c3 = build_commit_graph(
             self.repo.object_store, [[1], [2, 1], [3, 1, 2]]
         )
         self.repo.refs[b"HEAD"] = c3.id
@@ -3196,7 +3196,7 @@ class TagCreateSignTests(PorcelainGpgTestCase):
 
     def test_tag_gpg_sign_config_no_signing_key(self) -> None:
         """Test that tag.gpgSign=true works without user.signingKey (uses default)."""
-        c1, c2, c3 = build_commit_graph(
+        _c1, _c2, c3 = build_commit_graph(
             self.repo.object_store, [[1], [2, 1], [3, 1, 2]]
         )
         self.repo.refs[b"HEAD"] = c3.id
@@ -3228,7 +3228,7 @@ class TagCreateSignTests(PorcelainGpgTestCase):
 
     def test_explicit_sign_overrides_config(self) -> None:
         """Test that explicit sign parameter overrides tag.gpgSign config."""
-        c1, c2, c3 = build_commit_graph(
+        _c1, _c2, c3 = build_commit_graph(
             self.repo.object_store, [[1], [2, 1], [3, 1, 2]]
         )
         self.repo.refs[b"HEAD"] = c3.id
@@ -3262,7 +3262,7 @@ class TagCreateSignTests(PorcelainGpgTestCase):
 
     def test_explicit_false_disables_tag_signing(self) -> None:
         """Test that explicit sign=False disables signing even with config=true."""
-        c1, c2, c3 = build_commit_graph(
+        _c1, _c2, c3 = build_commit_graph(
             self.repo.object_store, [[1], [2, 1], [3, 1, 2]]
         )
         self.repo.refs[b"HEAD"] = c3.id
@@ -3296,7 +3296,7 @@ class TagCreateSignTests(PorcelainGpgTestCase):
 
 class TagCreateTests(PorcelainTestCase):
     def test_annotated(self) -> None:
-        c1, c2, c3 = build_commit_graph(
+        _c1, _c2, c3 = build_commit_graph(
             self.repo.object_store, [[1], [2, 1], [3, 1, 2]]
         )
         self.repo.refs[b"HEAD"] = c3.id
@@ -3318,7 +3318,7 @@ class TagCreateTests(PorcelainTestCase):
         self.assertRecentTimestamp(tag.tag_time)
 
     def test_unannotated(self) -> None:
-        c1, c2, c3 = build_commit_graph(
+        _c1, _c2, c3 = build_commit_graph(
             self.repo.object_store, [[1], [2, 1], [3, 1, 2]]
         )
         self.repo.refs[b"HEAD"] = c3.id
@@ -3331,7 +3331,7 @@ class TagCreateTests(PorcelainTestCase):
         self.assertEqual(list(tags.values()), [self.repo.head()])
 
     def test_unannotated_unicode(self) -> None:
-        c1, c2, c3 = build_commit_graph(
+        _c1, _c2, c3 = build_commit_graph(
             self.repo.object_store, [[1], [2, 1], [3, 1, 2]]
         )
         self.repo.refs[b"HEAD"] = c3.id
@@ -6761,7 +6761,7 @@ class BranchMergedTests(PorcelainTestCase):
     def test_no_merged_branches(self) -> None:
         """Test with no merged branches."""
         # Create complete graph: c1 → c2 (master), c1 → c3 (feature)
-        [c1, c2, c3] = build_commit_graph(
+        [_c1, c2, c3] = build_commit_graph(
             self.repo.object_store,
             [
                 [1],  # c1
@@ -6797,7 +6797,7 @@ class BranchMergedTests(PorcelainTestCase):
         """Test when some branches are merged, some are not."""
         # c1 → c2 → c3 (HEAD/master)
         # c1 → c4 → c5 (feature-1 - diverged)
-        [c1, c2, c3, c4, c5] = build_commit_graph(
+        [_c1, c2, c3, _c4, c5] = build_commit_graph(
             self.repo.object_store,
             [
                 [1],  # c1
@@ -6845,7 +6845,7 @@ class BranchNoMergedTests(PorcelainTestCase):
     def test_no_merged_branches(self) -> None:
         """Test with some non-merged branches."""
         # Create complete graph: c1 → c2 (master), c1 → c3 (feature)
-        [c1, c2, c3] = build_commit_graph(
+        [_c1, c2, c3] = build_commit_graph(
             self.repo.object_store,
             [
                 [1],  # c1
@@ -6864,7 +6864,7 @@ class BranchNoMergedTests(PorcelainTestCase):
         """Test when some branches are merged, some are not."""
         # c1 → c2 → c3 (HEAD/master)
         # c1 → c4 → c5 (feature-1 - diverged)
-        [c1, c2, c3, c4, c5] = build_commit_graph(
+        [_c1, c2, c3, _c4, c5] = build_commit_graph(
             self.repo.object_store,
             [
                 [1],  # c1
@@ -6887,7 +6887,7 @@ class BranchNoMergedTests(PorcelainTestCase):
         # c1 → c2 (HEAD/master)
         # c1 → c3 (feature-1 - diverged)
         # c1 → c4 (feature-2 - diverged)
-        [c1, c2, c3, c4] = build_commit_graph(
+        [_c1, c2, c3, c4] = build_commit_graph(
             self.repo.object_store,
             [
                 [1],  # c1
@@ -6921,7 +6921,7 @@ class BranchContainsTests(PorcelainTestCase):
     def test_commit_in_single_branch(self) -> None:
         """Test commit contained in only one branch."""
         # Create: c1 → c2 (master), c1 → c3 (feature)
-        [c1, c2, c3] = build_commit_graph(
+        [_c1, c2, c3] = build_commit_graph(
             self.repo.object_store,
             [
                 [1],  # c1
@@ -6993,7 +6993,7 @@ class BranchContainsTests(PorcelainTestCase):
     def test_commit_in_no_branches(self) -> None:
         """Test commit not contained in any branch."""
         # Create: c1 → c2 (master), c1 → c3 (feature), orphan c4
-        [c1, c2, c3, c4] = build_commit_graph(
+        [_c1, c2, c3, c4] = build_commit_graph(
             self.repo.object_store,
             [
                 [1],  # c1
@@ -7014,7 +7014,7 @@ class BranchContainsTests(PorcelainTestCase):
     def test_commit_ref_by_branch_name(self) -> None:
         """Test using branch name as commit reference."""
         # Create: c1 → c2 (master), c1 → c3 (feature)
-        [c1, c2, c3] = build_commit_graph(
+        [_c1, c2, c3] = build_commit_graph(
             self.repo.object_store,
             [
                 [1],  # c1
@@ -7038,7 +7038,9 @@ class BranchContainsTests(PorcelainTestCase):
     def test_commit_ref_by_head(self) -> None:
         """Test using HEAD as commit reference."""
         # Create: c1 → c2 → c3 (HEAD/master)
-        [c1, c2, c3] = build_commit_graph(self.repo.object_store, [[1], [2, 1], [3, 2]])
+        [_c1, c2, c3] = build_commit_graph(
+            self.repo.object_store, [[1], [2, 1], [3, 2]]
+        )
 
         self.repo.refs[b"HEAD"] = c3.id
         self.repo.refs[b"refs/heads/master"] = c3.id
@@ -7942,7 +7944,7 @@ class BranchTrackingTests(PorcelainTestCase):
 
     def test_set_branch_tracking(self) -> None:
         # Create a new branch
-        sha, _ = _commit_file_with_content(self.repo, "foo", "content\n")
+        _sha, _ = _commit_file_with_content(self.repo, "foo", "content\n")
         porcelain.branch_create(self.repo, "feature")
 
         # Set up tracking
@@ -7960,7 +7962,7 @@ class BranchTrackingTests(PorcelainTestCase):
 
 class FindUniqueAbbrevTests(PorcelainTestCase):
     def test_simple(self) -> None:
-        c1, c2, c3 = build_commit_graph(
+        c1, _c2, c3 = build_commit_graph(
             self.repo.object_store, [[1], [2, 1], [3, 1, 2]]
         )
         self.repo.refs[b"HEAD"] = c3.id
@@ -9002,7 +9004,7 @@ class BisectTests(PorcelainTestCase):
     def test_bisect_start(self):
         """Test starting a bisect session."""
         # Create some commits
-        c1, c2, c3 = build_commit_graph(
+        _c1, _c2, c3 = build_commit_graph(
             self.repo.object_store,
             [[1], [2, 1], [3, 2]],
             attrs={
@@ -9073,7 +9075,7 @@ class BisectTests(PorcelainTestCase):
     def test_bisect_log(self):
         """Test getting bisect log."""
         # Create some commits
-        c1, c2, c3 = build_commit_graph(
+        c1, _c2, c3 = build_commit_graph(
             self.repo.object_store,
             [[1], [2, 1], [3, 2]],
             attrs={
@@ -9100,7 +9102,7 @@ class BisectTests(PorcelainTestCase):
     def test_bisect_reset(self):
         """Test resetting bisect state."""
         # Create some commits
-        c1, c2, c3 = build_commit_graph(
+        c1, _c2, c3 = build_commit_graph(
             self.repo.object_store,
             [[1], [2, 1], [3, 2]],
             attrs={
@@ -9135,7 +9137,7 @@ class BisectTests(PorcelainTestCase):
     def test_bisect_skip(self):
         """Test skipping commits during bisect."""
         # Create some commits
-        c1, c2, c3, c4, c5 = build_commit_graph(
+        c1, c2, _c3, _c4, c5 = build_commit_graph(
             self.repo.object_store,
             [[1], [2, 1], [3, 2], [4, 3], [5, 4]],
             attrs={
@@ -9371,7 +9373,7 @@ class WriteCommitGraphTests(PorcelainTestCase):
     def test_write_commit_graph_reachable_false(self):
         """Test writing commit graph with reachable=False."""
         # Create commits
-        c1, c2, c3 = build_commit_graph(
+        _c1, _c2, c3 = build_commit_graph(
             self.repo.object_store,
             [[1], [2, 1], [3, 2]],
             attrs={

tests/test_porcelain_lfs.py

@@ -173,7 +173,7 @@ class LFSPorcelainTestCase(TestCase):
         lfs_files = porcelain.lfs_ls_files(self.repo)
 
         self.assertEqual(len(lfs_files), 1)
-        path, oid, size = lfs_files[0]
+        path, _oid, size = lfs_files[0]
         self.assertEqual(path, "large.bin")
         self.assertEqual(size, len(test_content))
 

tests/test_porcelain_merge.py

@@ -368,7 +368,7 @@ class PorcelainMergeTreeTests(TestCase):
             self.assertIn(b"file1.txt", merged_tree)
 
             # Get the merged blob content
-            file_mode, file_sha = merged_tree[b"file1.txt"]
+            _file_mode, file_sha = merged_tree[b"file1.txt"]
             merged_blob = repo[file_sha]
             content = merged_blob.data
 
@@ -441,7 +441,7 @@ class PorcelainMergeTreeTests(TestCase):
             their_tree_id = repo[their_commit_id].tree
 
             # Perform merge_tree with tree SHAs
-            merged_tree_id, conflicts = porcelain.merge_tree(
+            _merged_tree_id, conflicts = porcelain.merge_tree(
                 tmpdir,
                 base_tree_id if base_tree_id else None,
                 our_tree_id,

tests/test_reftable.py

@@ -82,7 +82,7 @@ class TestRefRecord(unittest.TestCase):
 
         # Decode should still work
         stream = BytesIO(encoded)
-        decoded_ref, refname = RefRecord.decode(stream, b"refs/heads/master")
+        _decoded_ref, refname = RefRecord.decode(stream, b"refs/heads/master")
         self.assertEqual(b"refs/heads/main", refname)
 
 

tests/test_utils.py

@@ -44,7 +44,7 @@ class BuildCommitGraphTest(TestCase):
         self.assertGreater(c2.commit_time, c1.commit_time)
 
     def test_merge(self) -> None:
-        c1, c2, c3, c4 = build_commit_graph(
+        _c1, c2, c3, c4 = build_commit_graph(
             self.store, [[1], [2, 1], [3, 1], [4, 2, 3]]
         )
         self.assertEqual([c2.id, c3.id], c4.parents)

tests/test_walk.py

@@ -81,7 +81,7 @@ class WalkerTest(TestCase):
         self.assertEqual(expected, actual)
 
     def test_tag(self) -> None:
-        c1, c2, c3 = self.make_linear_commits(3)
+        c1, c2, _c3 = self.make_linear_commits(3)
         t2 = make_tag(target=c2)
         self.store.add_object(t2)
         self.assertWalkYields([c2, c1], [t2.id])
@@ -297,7 +297,7 @@ class WalkerTest(TestCase):
 
     def test_changes_with_renames(self) -> None:
         blob = make_object(Blob, data=b"blob")
-        c1, c2 = self.make_linear_commits(
+        _c1, c2 = self.make_linear_commits(
             2, trees={1: [(b"a", blob)], 2: [(b"b", blob)]}
         )
         entry_a = (b"a", F, blob.id)
@@ -325,7 +325,7 @@ class WalkerTest(TestCase):
         names = [b"a", b"a", b"b", b"b", b"c", b"c"]
 
         trees = {i + 1: [(n, blob, F)] for i, n in enumerate(names)}
-        c1, c2, c3, c4, c5, c6 = self.make_linear_commits(6, trees=trees)
+        c1, _c2, c3, _c4, c5, c6 = self.make_linear_commits(6, trees=trees)
         self.assertWalkYields([c5], [c6.id], paths=[b"c"])
 
         def e(n):
@@ -474,7 +474,7 @@ class WalkerTest(TestCase):
         self.assertWalkYields([m6, x2], [m6.id], exclude=[y5.id])
 
     def test_empty_walk(self) -> None:
-        c1, c2, c3 = self.make_linear_commits(3)
+        _c1, _c2, c3 = self.make_linear_commits(3)
         self.assertWalkYields([], [c3.id], exclude=[c3.id])
 
 
@@ -526,7 +526,7 @@ class WalkEntryTest(TestCase):
         blob_a2 = make_object(Blob, data=b"a2")
         blob_b = make_object(Blob, data=b"b")
         blob_b2 = make_object(Blob, data=b"b2")
-        x1, y2, m3 = self.make_commits(
+        _x1, _y2, m3 = self.make_commits(
             [[1], [2], [3, 1, 2]],
             trees={
                 1: [(b"x/a", blob_a)],
@@ -587,7 +587,7 @@ class WalkEntryTest(TestCase):
         blob_a2 = make_object(Blob, data=b"a2")
         blob_b = make_object(Blob, data=b"b")
         blob_b2 = make_object(Blob, data=b"b2")
-        x1, y2, m3 = self.make_commits(
+        _x1, _y2, m3 = self.make_commits(
             [[1], [2], [3, 1, 2]],
             trees={
                 1: [(b"x/a", blob_a)],

tests/test_whitespace.py

@@ -82,10 +82,10 @@ class WhitespaceConfigTests(TestCase):
 
     def test_parse_invalid_tabwidth(self) -> None:
         """Test invalid tabwidth defaults to 8."""
-        errors, tab_width = parse_whitespace_config("tabwidth=invalid")
+        _errors, tab_width = parse_whitespace_config("tabwidth=invalid")
         self.assertEqual(tab_width, 8)
 
-        errors, tab_width = parse_whitespace_config("tabwidth=0")
+        _errors, tab_width = parse_whitespace_config("tabwidth=0")
         self.assertEqual(tab_width, 8)