pygit2 1.14.0__tar.gz → 1.15.0__tar.gz

{pygit2-1.14.0 → pygit2-1.15.0}/AUTHORS.md

@@ -72,6 +72,7 @@ Authors:
     Jason Ziglar
     Leonardo Rhodes
     Mark Adams
+    Michał Kępień
     Nika Layzell
     Peter-Yi Zhang
     Petr Viktorin
@@ -81,6 +82,7 @@ Authors:
     Sukhman Bhuller
     Thomas Kluyver
     Tyler Cipriani
+    WANG Xuerui
     Alex Chamberlain
     Alexander Bayandin
     Amit Bakshi
@@ -161,6 +163,7 @@ Authors:
     Erik van Zijst
     Fabrice Salvaire
     Ferengee
+    Florian Weimer
     Frazer McLean
     Gustavo Di Pietro
     Holger Frey
@@ -184,10 +187,12 @@ Authors:
     Mathieu Parent
     Mathieu Pillard
     Matthaus Woolard
+    Maxwell G
     Michał Górny
     Nicolás Sanguinetti
     Nikita Kartashov
     Nikolai Zujev
+    Nils Philippsen
     Noah Fontes
     Óscar San José
     Patrick Lühne
@@ -211,6 +216,7 @@ Authors:
     Tad Hardesty
     Timo Röhling
     Vladimir Rutsky
+    Wim Jeantine-Glenn
     Yu Jianjian
     buhl
     chengyuhang

{pygit2-1.14.0 → pygit2-1.15.0}/CHANGELOG.md

@@ -1,7 +1,81 @@
+# 1.15.0 (2024-05-18)
+
+- Many deprecated features have been removed, see below
+
+- Upgrade to libgit2 v1.8.1
+
+- New `push_options` optional argument in `Repository.push(...)`
+  [#1282](https://github.com/libgit2/pygit2/pull/1282)
+
+- New support comparison of `Oid` with text string
+
+- Fix `CheckoutNotify.IGNORED`
+  [#1288](https://github.com/libgit2/pygit2/issues/1288)
+
+- Use default error handler when decoding/encoding paths
+  [#537](https://github.com/libgit2/pygit2/issues/537)
+
+- Remove setuptools runtime dependency
+  [#1281](https://github.com/libgit2/pygit2/pull/1281)
+
+- Coding style with ruff
+  [#1280](https://github.com/libgit2/pygit2/pull/1280)
+
+- Add wheels for ppc64le
+  [#1279](https://github.com/libgit2/pygit2/pull/1279)
+
+- Fix tests on EPEL8 builds for s390x
+  [#1283](https://github.com/libgit2/pygit2/pull/1283)
+
+Deprecations:
+
+- Deprecate `IndexEntry.hex`, use `str(IndexEntry.id)`
+
+Breaking changes:
+
+- Remove deprecated `oid.hex`, use `str(oid)`
+- Remove deprecated `object.hex`, use `str(object.id)`
+- Remove deprecated `object.oid`, use `object.id`
+
+- Remove deprecated `Repository.add_submodule(...)`, use `Repository.submodules.add(...)`
+- Remove deprecated `Repository.lookup_submodule(...)`, use `Repository.submodules[...]`
+- Remove deprecated `Repository.init_submodules(...)`, use `Repository.submodules.init(...)`
+- Remove deprecated `Repository.update_submodule(...)`, use `Repository.submodules.update(...)`
+
+- Remove deprecated constants `GIT_OBJ_XXX`, use `ObjectType`
+- Remove deprecated constants `GIT_REVPARSE_XXX`, use `RevSpecFlag`
+- Remove deprecated constants `GIT_REF_XXX`, use `ReferenceType`
+- Remove deprecated `ReferenceType.OID`, use instead `ReferenceType.DIRECT`
+- Remove deprecated `ReferenceType.LISTALL`, use instead `ReferenceType.ALL`
+
+- Remove deprecated support for passing dicts to repository\'s `merge(...)`,
+  `merge_commits(...)` and `merge_trees(...)`. Instead pass `MergeFlag` for `flags`, and
+  `MergeFileFlag` for `file_flags`.
+
+- Remove deprecated support for passing a string for the favor argument to repository\'s
+  `merge(...)`, `merge_commits(...)` and `merge_trees(...)`. Instead pass `MergeFavor`.
+
+
+# 1.14.1 (2024-02-10)
+
+- Update wheels to libgit2 v1.7.2
+
+- Now `Object.filemode` returns `enums.FileMode` and `Reference.type` returns
+  `enums.ReferenceType`
+  [#1273](https://github.com/libgit2/pygit2/pull/1273)
+
+- Fix tests on Fedora 40
+  [#1275](https://github.com/libgit2/pygit2/pull/1275)
+
+Deprecations:
+
+- Deprecate `ReferenceType.OID`, use `ReferenceType.DIRECT`
+- Deprecate `ReferenceType.LISTALL`, use `ReferenceType.ALL`
+
 # 1.14.0 (2024-01-26)
 
 -   Drop support for Python 3.8
--   Add Linux wheels for musl on x86_64
+-   Add Linux wheels for musl on x86\_64
     [#1266](https://github.com/libgit2/pygit2/pull/1266)
 -   New `Repository.submodules` namespace
     [#1250](https://github.com/libgit2/pygit2/pull/1250)
@@ -33,15 +107,18 @@ Breaking changes:
 
 Deprecations:
 
--   Deprecate `Repository.add_submodule(...)`, use `Repository.submodules.add(...)`
--   Deprecate `Repository.lookup_submodule(...)`, use `Repository.submodules[...]`
--   Deprecate `Repository.init_submodules(...)`, use `Repository.submodules.init(...)`
--   Deprecate `Repository.update_submodule(...)`, use `Repository.submodules.update(...)`
--   Deprecate `GIT_*` constants, use `pygit2.enums`
--   Passign dicts to repository\'s `merge(...)`, `merge_commits(...)`
-    and `merge_trees(...)` is deprecated. Instead pass `MergeFavor` for
-    the `favor` argument, `MergeFlag` for `flags`, and `MergeFileFlag`
-    for `file_flags`.
+- Deprecate `Repository.add_submodule(...)`, use `Repository.submodules.add(...)`
+- Deprecate `Repository.lookup_submodule(...)`, use `Repository.submodules[...]`
+- Deprecate `Repository.init_submodules(...)`, use `Repository.submodules.init(...)`
+- Deprecate `Repository.update_submodule(...)`, use `Repository.submodules.update(...)`
+- Deprecate `GIT_*` constants, use `pygit2.enums`
+
+- Passing dicts to repository\'s `merge(...)`, `merge_commits(...)` and `merge_trees(...)`
+  is deprecated. Instead pass `MergeFlag` for the `flags` argument, and `MergeFileFlag` for
+  `file_flags`.
+
+- Passing a string for the favor argument to repository\'s `merge(...)`, `merge_commits(...)`
+  and `merge_trees(...)` is deprecated. Instead pass `MergeFavor`.
 
 # 1.13.3 (2023-11-21)
 

pygit2-1.15.0/Makefile

@@ -0,0 +1,7 @@
+.PHONY: build html
+
+build:
+	OPENSSL_VERSION=3.1.5 LIBSSH2_VERSION=1.11.0 LIBGIT2_VERSION=1.8.1 sh build.sh
+
+html: build
+	make -C docs html

{pygit2-1.14.0 → pygit2-1.15.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pygit2
-Version: 1.14.0
+Version: 1.15.0
 Summary: Python bindings for libgit2.
 Home-page: https://github.com/libgit2/pygit2
 Maintainer: J. David Ibáñez
@@ -26,7 +26,6 @@ Description-Content-Type: text/markdown
 License-File: COPYING
 License-File: AUTHORS.md
 Requires-Dist: cffi>=1.16.0
-Requires-Dist: setuptools; python_version >= "3.12"
 
 # pygit2 - libgit2 bindings in Python
 
@@ -48,8 +47,6 @@ Supports Python 3.9 to 3.12 and PyPy3 7.3+
 
 ## Sponsors
 
--   [Iterative](https://iterative.ai/)
-
 Add your name and link here, [become a
 sponsor](https://github.com/sponsors/jdavid).
 

{pygit2-1.14.0 → pygit2-1.15.0}/README.md

@@ -18,8 +18,6 @@ Supports Python 3.9 to 3.12 and PyPy3 7.3+
 
 ## Sponsors
 
--   [Iterative](https://iterative.ai/)
-
 Add your name and link here, [become a
 sponsor](https://github.com/sponsors/jdavid).
 

{pygit2-1.14.0 → pygit2-1.15.0}/build.sh

@@ -22,14 +22,14 @@
 #
 #   sh build.sh
 #
-# Build libgit2 1.7.1 (will use libssh2 if available), then build pygit2
+# Build libgit2 1.8.1 (will use libssh2 if available), then build pygit2
 # inplace:
 #
-#   LIBGIT2_VERSION=1.7.1 sh build.sh
+#   LIBGIT2_VERSION=1.8.1 sh build.sh
 #
-# Build libssh2 1.11.0 and libgit2 1.7.1, then build pygit2 inplace:
+# Build libssh2 1.11.0 and libgit2 1.8.1, then build pygit2 inplace:
 #
-#   LIBSSH2_VERSION=1.11.0 LIBGIT2_VERSION=1.7.1 sh build.sh
+#   LIBSSH2_VERSION=1.11.0 LIBGIT2_VERSION=1.8.1 sh build.sh
 #
 # Build inplace and run the tests:
 #

{pygit2-1.14.0 → pygit2-1.15.0}/pygit2/__init__.py

@@ -66,15 +66,17 @@ _cache_enums()
 
 
 def init_repository(
-        path: typing.Union[str, bytes, PathLike, None],
-        bare: bool = False,
-        flags: enums.RepositoryInitFlag = enums.RepositoryInitFlag.MKPATH,
-        mode: typing.Union[int, enums.RepositoryInitMode] = enums.RepositoryInitMode.SHARED_UMASK,
-        workdir_path: typing.Optional[str] = None,
-        description: typing.Optional[str] = None,
-        template_path: typing.Optional[str] = None,
-        initial_head: typing.Optional[str] = None,
-        origin_url: typing.Optional[str] = None
+    path: typing.Union[str, bytes, PathLike, None],
+    bare: bool = False,
+    flags: enums.RepositoryInitFlag = enums.RepositoryInitFlag.MKPATH,
+    mode: typing.Union[
+        int, enums.RepositoryInitMode
+    ] = enums.RepositoryInitMode.SHARED_UMASK,
+    workdir_path: typing.Optional[str] = None,
+    description: typing.Optional[str] = None,
+    template_path: typing.Optional[str] = None,
+    initial_head: typing.Optional[str] = None,
+    origin_url: typing.Optional[str] = None,
 ) -> Repository:
     """
     Creates a new Git repository in the given *path*.
@@ -108,8 +110,7 @@ def init_repository(
 
     # Options
     options = ffi.new('git_repository_init_options *')
-    C.git_repository_init_options_init(options,
-                                       C.GIT_REPOSITORY_INIT_OPTIONS_VERSION)
+    C.git_repository_init_options_init(options, C.GIT_REPOSITORY_INIT_OPTIONS_VERSION)
     options.flags = int(flags)
     options.mode = mode
 
@@ -143,8 +144,15 @@ def init_repository(
 
 
 def clone_repository(
-        url, path, bare=False, repository=None, remote=None,
-        checkout_branch=None, callbacks=None, depth=0):
+    url,
+    path,
+    bare=False,
+    repository=None,
+    remote=None,
+    checkout_branch=None,
+    callbacks=None,
+    depth=0,
+):
     """
     Clones a new Git repository from *url* in the given *path*.
 

{pygit2-1.14.0 → pygit2-1.15.0}/pygit2/_build.py

@@ -34,7 +34,7 @@ from pathlib import Path
 #
 # The version number of pygit2
 #
-__version__ = '1.14.0'
+__version__ = '1.15.0'
 
 
 #
@@ -70,5 +70,5 @@ def get_libgit2_paths():
             'libraries': ['git2'],
             'include_dirs': [str(x) for x in include_dirs],
             'library_dirs': [str(x) for x in library_dirs],
-        }
+        },
     )

{pygit2-1.14.0 → pygit2-1.15.0}/pygit2/_pygit2.pyi

@@ -15,6 +15,7 @@ from .enums import (
     ObjectType,
     Option,
     ReferenceFilter,
+    ReferenceType,
     ResetMode,
     SortMode,
 )
@@ -34,25 +35,25 @@ LIBGIT2_VER_REVISION: int
 
 class Object:
     _pointer: bytes
-    filemode: int
+    filemode: FileMode
     hex: str
     id: Oid
     name: str | None
     oid: Oid
     raw_name: bytes | None
     short_id: str
-    type: "Literal[GIT_OBJ_COMMIT] | Literal[GIT_OBJ_TREE] | Literal[GIT_OBJ_TAG] | Literal[GIT_OBJ_BLOB]"
+    type: 'Literal[GIT_OBJ_COMMIT] | Literal[GIT_OBJ_TREE] | Literal[GIT_OBJ_TAG] | Literal[GIT_OBJ_BLOB]'
     type_str: "Literal['commit'] | Literal['tree'] | Literal['tag'] | Literal['blob']"
     @overload
-    def peel(self, target_type: "Literal[GIT_OBJ_COMMIT]") -> "Commit": ...
+    def peel(self, target_type: 'Literal[GIT_OBJ_COMMIT]') -> 'Commit': ...
     @overload
-    def peel(self, target_type: "Literal[GIT_OBJ_TREE]") -> "Tree": ...
+    def peel(self, target_type: 'Literal[GIT_OBJ_TREE]') -> 'Tree': ...
     @overload
-    def peel(self, target_type: "Literal[GIT_OBJ_TAG]") -> "Tag": ...
+    def peel(self, target_type: 'Literal[GIT_OBJ_TAG]') -> 'Tag': ...
     @overload
-    def peel(self, target_type: "Literal[GIT_OBJ_BLOB]") -> "Blob": ...
+    def peel(self, target_type: 'Literal[GIT_OBJ_BLOB]') -> 'Blob': ...
     @overload
-    def peel(self, target_type: "None") -> "Commit|Tree|Blob": ...
+    def peel(self, target_type: 'None') -> 'Commit|Tree|Blob': ...
     def read_raw(self) -> bytes: ...
     def __eq__(self, other) -> bool: ...
     def __ge__(self, other) -> bool: ...
@@ -69,20 +70,20 @@ class Reference:
     raw_target: Oid | bytes
     shorthand: str
     target: Oid | str
-    type: int
+    type: ReferenceType
     def __init__(self, *args) -> None: ...
     def delete(self) -> None: ...
     def log(self) -> Iterator[RefLogEntry]: ...
     @overload
-    def peel(self, type: "Literal[GIT_OBJ_COMMIT]") -> "Commit": ...
+    def peel(self, type: 'Literal[GIT_OBJ_COMMIT]') -> 'Commit': ...
     @overload
-    def peel(self, type: "Literal[GIT_OBJ_TREE]") -> "Tree": ...
+    def peel(self, type: 'Literal[GIT_OBJ_TREE]') -> 'Tree': ...
     @overload
-    def peel(self, type: "Literal[GIT_OBJ_TAG]") -> "Tag": ...
+    def peel(self, type: 'Literal[GIT_OBJ_TAG]') -> 'Tag': ...
     @overload
-    def peel(self, type: "Literal[GIT_OBJ_BLOB]") -> "Blob": ...
+    def peel(self, type: 'Literal[GIT_OBJ_BLOB]') -> 'Blob': ...
     @overload
-    def peel(self, type: "None") -> "Commit|Tree|Blob": ...
+    def peel(self, type: 'None') -> 'Commit|Tree|Blob': ...
     def rename(self, new_name: str) -> None: ...
     def resolve(self) -> Reference: ...
     def set_target(self, target: _OidArg, message: str = ...) -> None: ...
@@ -99,8 +100,20 @@ class Blob(Object):
     data: bytes
     is_binary: bool
     size: int
-    def diff(self, blob: Blob = ..., flag: int = ..., old_as_path: str = ..., new_as_path: str = ...) -> Patch: ...
-    def diff_to_buffer(self, buffer: Optional[bytes] = None, flag: DiffOption = DiffOption.NORMAL, old_as_path: str = ..., buffer_as_path: str = ...) -> Patch: ...
+    def diff(
+        self,
+        blob: Blob = ...,
+        flag: int = ...,
+        old_as_path: str = ...,
+        new_as_path: str = ...,
+    ) -> Patch: ...
+    def diff_to_buffer(
+        self,
+        buffer: Optional[bytes] = None,
+        flag: DiffOption = DiffOption.NORMAL,
+        old_as_path: str = ...,
+        buffer_as_path: str = ...,
+    ) -> Patch: ...
 
 class Branch(Reference):
     branch_name: str
@@ -133,7 +146,15 @@ class Diff:
     patch: str | None
     patchid: Oid
     stats: DiffStats
-    def find_similar(self, flags: DiffFind = DiffFind.FIND_BY_CONFIG, rename_threshold : int = 50, copy_threshold : int = 50, rename_from_rewrite_threshold: int = 50, break_rewrite_threshold: int = 60, rename_limit: int = 1000) -> None: ...
+    def find_similar(
+        self,
+        flags: DiffFind = DiffFind.FIND_BY_CONFIG,
+        rename_threshold: int = 50,
+        copy_threshold: int = 50,
+        rename_from_rewrite_threshold: int = 50,
+        break_rewrite_threshold: int = 60,
+        rename_limit: int = 1000,
+    ) -> None: ...
     def merge(self, diff: Diff) -> None: ...
     @staticmethod
     def from_c(diff, repo) -> Diff: ...
@@ -187,24 +208,31 @@ class DiffStats:
     def format(self, format: DiffStatsFormat, width: int) -> str: ...
 
 class GitError(Exception): ...
-
 class InvalidSpecError(ValueError): ...
 
 class Mailmap:
     def __init__(self, *args) -> None: ...
-    def add_entry(self, real_name: str = ..., real_email: str = ..., replace_name: str = ..., replace_email: str = ...) -> None: ...
+    def add_entry(
+        self,
+        real_name: str = ...,
+        real_email: str = ...,
+        replace_name: str = ...,
+        replace_email: str = ...,
+    ) -> None: ...
     @staticmethod
     def from_buffer(buffer: str | bytes) -> Mailmap: ...
     @staticmethod
     def from_repository(repository: Repository) -> Mailmap: ...
-    def resolve(self, name: str, email: str) -> tuple[str,str]: ...
+    def resolve(self, name: str, email: str) -> tuple[str, str]: ...
     def resolve_signature(self, sig: Signature) -> Signature: ...
 
 class Note:
     annotated_id: Oid
     id: Oid
     message: str
-    def remove(self, author: Signature, committer: Signature, ref: str = "refs/notes/commits") -> None: ...
+    def remove(
+        self, author: Signature, committer: Signature, ref: str = 'refs/notes/commits'
+    ) -> None: ...
 
 class Odb:
     backends: Iterator[OdbBackend]
@@ -254,13 +282,13 @@ class Patch:
 
     @staticmethod
     def create_from(
-            old: Blob | bytes | None,
-            new: Blob | bytes | None,
-            old_as_path: str = ...,
-            new_as_path: str = ...,
-            flag: DiffOption = DiffOption.NORMAL,
-            context_lines: int = 3,
-            interhunk_lines: int = 0
+        old: Blob | bytes | None,
+        new: Blob | bytes | None,
+        old_as_path: str = ...,
+        new_as_path: str = ...,
+        flag: DiffOption = DiffOption.NORMAL,
+        context_lines: int = 3,
+        interhunk_lines: int = 0,
     ) -> Patch: ...
 
 class RefLogEntry:
@@ -287,8 +315,18 @@ class RefdbBackend:
     def exists(self, refname: str) -> bool: ...
     def has_log(self, ref_name: str) -> bool: ...
     def lookup(self, refname: str) -> Reference: ...
-    def rename(self, old_name: str, new_name: str, force: bool, who: Signature, message: str) -> Reference: ...
-    def write(self, ref: Reference, force: bool, who: Signature, message: str, old: _OidArg, old_target: str) -> None: ...
+    def rename(
+        self, old_name: str, new_name: str, force: bool, who: Signature, message: str
+    ) -> Reference: ...
+    def write(
+        self,
+        ref: Reference,
+        force: bool,
+        who: Signature,
+        message: str,
+        old: _OidArg,
+        old_target: str,
+    ) -> None: ...
 
 class RefdbFsBackend(RefdbBackend):
     def __init__(self, *args, **kwargs) -> None: ...
@@ -311,22 +349,62 @@ class Repository:
     def _disown(self, *args, **kwargs) -> None: ...
     def _from_c(self, *args, **kwargs) -> None: ...
     def add_worktree(self, name: str, path: str, ref: Reference = ...) -> Worktree: ...
-    def applies(self, diff: Diff, location: ApplyLocation = ApplyLocation.INDEX, raise_error: bool = False) -> bool: ...
-    def apply(self, diff: Diff, location: ApplyLocation = ApplyLocation.WORKDIR) -> None: ...
+    def applies(
+        self,
+        diff: Diff,
+        location: ApplyLocation = ApplyLocation.INDEX,
+        raise_error: bool = False,
+    ) -> bool: ...
+    def apply(
+        self, diff: Diff, location: ApplyLocation = ApplyLocation.WORKDIR
+    ) -> None: ...
     def cherrypick(self, id: _OidArg) -> None: ...
     def compress_references(self) -> None: ...
     def create_blob(self, data: bytes) -> Oid: ...
     def create_blob_fromdisk(self, path: str) -> Oid: ...
     def create_blob_fromiobase(self, iobase: IOBase) -> Oid: ...
     def create_blob_fromworkdir(self, path: str) -> Oid: ...
-    def create_branch(self, name: str, commit: Commit, force = False) -> Branch: ...
-    def create_commit(self, reference_name: Optional[str], author: Signature, committer: Signature, message: str | bytes, tree: _OidArg, parents: list[_OidArg], encoding: str = ...) -> Oid: ...
-    def create_commit_string(self, author: Signature, committer: Signature, message: str | bytes, tree: _OidArg, parents: list[_OidArg], encoding: str = ...) -> Oid: ...
-    def create_commit_with_signature(self, content: str, signature: str, signature_field: Optional[str] = None) -> Oid: ...
-    def create_note(self, message: str, author: Signature, committer: Signature, annotated_id: str, ref: str = "refs/notes/commits", force: bool = False) -> Oid: ...
-    def create_reference_direct(self, name: str, target: _OidArg, force: bool, message: Optional[str] = None) -> Reference: ...
-    def create_reference_symbolic(self, name: str, target: str, force: bool, message: Optional[str] = None) -> Reference: ...
-    def create_tag(self, name: str, oid: _OidArg, type: ObjectType, tagger: Signature, message: str) -> Oid: ...
+    def create_branch(self, name: str, commit: Commit, force=False) -> Branch: ...
+    def create_commit(
+        self,
+        reference_name: Optional[str],
+        author: Signature,
+        committer: Signature,
+        message: str | bytes,
+        tree: _OidArg,
+        parents: list[_OidArg],
+        encoding: str = ...,
+    ) -> Oid: ...
+    def create_commit_string(
+        self,
+        author: Signature,
+        committer: Signature,
+        message: str | bytes,
+        tree: _OidArg,
+        parents: list[_OidArg],
+        encoding: str = ...,
+    ) -> Oid: ...
+    def create_commit_with_signature(
+        self, content: str, signature: str, signature_field: Optional[str] = None
+    ) -> Oid: ...
+    def create_note(
+        self,
+        message: str,
+        author: Signature,
+        committer: Signature,
+        annotated_id: str,
+        ref: str = 'refs/notes/commits',
+        force: bool = False,
+    ) -> Oid: ...
+    def create_reference_direct(
+        self, name: str, target: _OidArg, force: bool, message: Optional[str] = None
+    ) -> Reference: ...
+    def create_reference_symbolic(
+        self, name: str, target: str, force: bool, message: Optional[str] = None
+    ) -> Reference: ...
+    def create_tag(
+        self, name: str, oid: _OidArg, type: ObjectType, tagger: Signature, message: str
+    ) -> Oid: ...
     def descendant_of(self, oid1: _OidArg, oid2: _OidArg) -> bool: ...
     def expand_id(self, hex: str) -> Oid: ...
     def free(self) -> None: ...
@@ -336,30 +414,46 @@ class Repository:
     def listall_mergeheads(self) -> list[Oid]: ...
     def listall_stashes(self) -> list[Stash]: ...
     def listall_submodules(self) -> list[str]: ...
-    def lookup_branch(self, branch_name: str, branch_type: BranchType = BranchType.LOCAL) -> Branch: ...
-    def lookup_note(self, annotated_id: str, ref: str = "refs/notes/commits") -> Note: ...
+    def lookup_branch(
+        self, branch_name: str, branch_type: BranchType = BranchType.LOCAL
+    ) -> Branch: ...
+    def lookup_note(
+        self, annotated_id: str, ref: str = 'refs/notes/commits'
+    ) -> Note: ...
     def lookup_reference(self, name: str) -> Reference: ...
     def lookup_reference_dwim(self, name: str) -> Reference: ...
     def lookup_worktree(self, name: str) -> Worktree: ...
-    def merge_analysis(self, their_head: _OidArg, our_ref: str = "HEAD") -> tuple[MergeAnalysis, MergePreference]: ...
+    def merge_analysis(
+        self, their_head: _OidArg, our_ref: str = 'HEAD'
+    ) -> tuple[MergeAnalysis, MergePreference]: ...
     def merge_base(self, oid1: _OidArg, oid2: _OidArg) -> Oid: ...
     def merge_base_many(self, oids: list[_OidArg]) -> Oid: ...
     def merge_base_octopus(self, oids: list[_OidArg]) -> Oid: ...
     def notes(self) -> Iterator[Note]: ...
     def path_is_ignored(self, path: str) -> bool: ...
-    def raw_listall_branches(self, flag: BranchType = BranchType.LOCAL) -> list[bytes]: ...
+    def raw_listall_branches(
+        self, flag: BranchType = BranchType.LOCAL
+    ) -> list[bytes]: ...
     def raw_listall_references(self) -> list[bytes]: ...
     def references_iterator_init(self) -> Iterator[Reference]: ...
-    def references_iterator_next(self, iter: Iterator, references_return_type: ReferenceFilter = ReferenceFilter.ALL) -> Reference: ...
+    def references_iterator_next(
+        self,
+        iter: Iterator,
+        references_return_type: ReferenceFilter = ReferenceFilter.ALL,
+    ) -> Reference: ...
     def reset(self, oid: _OidArg, reset_type: ResetMode) -> None: ...
     def revparse(self, revspec: str) -> RevSpec: ...
-    def revparse_ext(self, revision: str) -> tuple[Object,Reference]: ...
+    def revparse_ext(self, revision: str) -> tuple[Object, Reference]: ...
     def revparse_single(self, revision: str) -> Object: ...
     def set_odb(self, odb: Odb) -> None: ...
     def set_refdb(self, refdb: Refdb) -> None: ...
-    def status(self, untracked_files: str = "all", ignored: bool = False) -> dict[str,int]: ...
+    def status(
+        self, untracked_files: str = 'all', ignored: bool = False
+    ) -> dict[str, int]: ...
     def status_file(self, path: str) -> int: ...
-    def walk(self, oid: _OidArg | None, sort_mode: SortMode = SortMode.NONE) -> Walker: ...
+    def walk(
+        self, oid: _OidArg | None, sort_mode: SortMode = SortMode.NONE
+    ) -> Walker: ...
 
 class RevSpec:
     flags: int
@@ -375,7 +469,14 @@ class Signature:
     raw_email: bytes
     raw_name: bytes
     time: int
-    def __init__(self, name: str, email: str, time: int = -1, offset: int = 0, encoding: Optional[str] = None) -> None: ...
+    def __init__(
+        self,
+        name: str,
+        email: str,
+        time: int = -1,
+        offset: int = 0,
+        encoding: Optional[str] = None,
+    ) -> None: ...
     def __eq__(self, other) -> bool: ...
     def __ge__(self, other) -> bool: ...
     def __gt__(self, other) -> bool: ...
@@ -404,9 +505,27 @@ class Tag(Object):
     def get_object(self) -> Object: ...
 
 class Tree(Object):
-    def diff_to_index(self, index: Index, flags: DiffOption = DiffOption.NORMAL, context_lines: int = 3, interhunk_lines: int = 0) -> Diff: ...
-    def diff_to_tree(self, tree: Tree = ..., flags: DiffOption = DiffOption.NORMAL, context_lines: int = 3, interhunk_lines: int = 3, swap: bool = False) -> Diff: ...
-    def diff_to_workdir(self, flags: DiffOption = DiffOption.NORMAL, context_lines: int = 3, interhunk_lines: int = 0) -> Diff: ...
+    def diff_to_index(
+        self,
+        index: Index,
+        flags: DiffOption = DiffOption.NORMAL,
+        context_lines: int = 3,
+        interhunk_lines: int = 0,
+    ) -> Diff: ...
+    def diff_to_tree(
+        self,
+        tree: Tree = ...,
+        flags: DiffOption = DiffOption.NORMAL,
+        context_lines: int = 3,
+        interhunk_lines: int = 3,
+        swap: bool = False,
+    ) -> Diff: ...
+    def diff_to_workdir(
+        self,
+        flags: DiffOption = DiffOption.NORMAL,
+        context_lines: int = 3,
+        interhunk_lines: int = 0,
+    ) -> Diff: ...
     def __contains__(self, other: str) -> bool: ...  # Tree_contains
     def __getitem__(self, index: str | int) -> Object: ...  # Tree_subscript
     def __iter__(self) -> Iterator[Object]: ...
@@ -428,16 +547,18 @@ class Walker:
     def reset(self) -> None: ...
     def simplify_first_parent(self) -> None: ...
     def sort(self, mode: SortMode) -> None: ...
-    def __iter__(self) -> Iterator[Commit]: ... #Walker: ...
+    def __iter__(self) -> Iterator[Commit]: ...  # Walker: ...
     def __next__(self) -> Commit: ...
 
 class Worktree:
     is_prunable: bool
     name: str
     path: str
-    def prune(self, force = False) -> None: ...
+    def prune(self, force=False) -> None: ...
 
-def discover_repository(path: str, across_fs: bool = False, ceiling_dirs: str = ...) -> str: ...
+def discover_repository(
+    path: str, across_fs: bool = False, ceiling_dirs: str = ...
+) -> str: ...
 def hash(data: bytes) -> Oid: ...
 def hashfile(path: str) -> Oid: ...
 def init_file_backend(path: str, flags: int = 0) -> object: ...