pygit2 1.19.3__tar.gz → 1.20.0__tar.gz

{pygit2-1.19.3 → pygit2-1.20.0}/AGENTS.md

@@ -11,7 +11,7 @@ and a high-level, Pythonic API for repository manipulation.
 - **License**: GPLv2 with linking exception (see `COPYING`)
 - **Maintainer**: J. David Ibáñez
 - **Python Support**: 3.11 – 3.14 and PyPy3 7.3+
-- **libgit2 Version**: 1.9.4
+- **libgit2 Version**: 1.9.6
 - **Homepage**: <https://www.pygit2.org/>
 - **Repository**: <https://github.com/libgit2/pygit2>
 
@@ -56,8 +56,8 @@ modules:
     `repository.py`, `callbacks.py`, `config.py`, `index.py`, `remotes.py`,
     `settings.py`, `submodules.py`, `transaction.py`, `filter.py`, `blob.py`,
     `blame.py`, `branches.py`, `credentials.py`, `errors.py`, `options.py`,
-    `packbuilder.py`, `references.py`, `refspec.py`, `utils.py`, `enums.py`,
-    `legacyenums.py`.
+    `packbuilder.py`, `rebase.py`, `references.py`, `refspec.py`, `utils.py`,
+    `enums.py`.
 
 - **`test/`** — pytest suite with fixture-based repository handling.
 - **`docs/`** — Sphinx documentation (RTD theme).
@@ -65,7 +65,8 @@ modules:
 ## Key Configuration Files
 
 - **`setup.py`** — setuptools entry point. Builds both the C extension
-  (`src/*.c`) and the CFFI extension (`pygit2/_run.py:ffi`).
+  (`src/*.c`) and the CFFI extension (`pygit2/_run.py:ffi`). On Windows it
+  also copies `git2.dll` into the package (see `BuildWithDLLs`).
 - **`pyproject.toml`** — Build-system requirements, `cibuildwheel`
   configuration, `ruff` settings, and `codespell` settings.
 - **`setup.cfg`** — Legacy pycodestyle configuration.
@@ -73,7 +74,7 @@ modules:
   `testpaths = test/`).
 - **`mypy.ini`** — mypy configuration with strict settings.
 - **`mypy-stubtest.ini`** — mypy configuration for `stubtest` against
-  `_pygit2.pyi`.
+  `_pygit2.pyi` (at the repo root).
 - **`requirements.txt`** — Runtime/build requirements (`cffi>=2.0`,
   `setuptools` for Python >= 3.12).
 - **`requirements-test.txt`** — Test requirements (`pytest`, `pytest-cov`).
@@ -106,16 +107,14 @@ handles libgit2 compilation via CMake.
 make
 
 # Or manually:
-LIBSSH2_VERSION=1.11.1 LIBGIT2_VERSION=1.9.4 sh build.sh
+LIBSSH2_VERSION=1.11.1 LIBGIT2_VERSION=1.9.6 sh build.sh
 
-# Build inplace and run the tests
-sh build.sh test
-
-# Build a wheel, install it, and run the tests
+# Build a wheel and bundle the shared libraries into it
 sh build.sh wheel
+sh build.sh bundle
 
-# Run tests with coverage
-sh build.sh test   # build.sh adds --cov=pygit2
+# Build inplace and run the tests with coverage (build.sh adds --cov=pygit2)
+sh build.sh test
 
 # Run mypy type checking
 sh build.sh mypy
@@ -167,7 +166,12 @@ make -C docs html   # requires sphinx-rtd-theme
   - Target Python: 3.11+
   - Quote style: single quotes
   - Selected rules: `E4`, `E7`, `E9`, `F`, `I`, `UP035`, `UP007`
-- **Type checker**: mypy (strict settings enabled; see `mypy.ini`)
+  - Run `ruff format` and `ruff check` on changed files before committing.
+    CI runs `ruff format --diff` and `ruff check`; formatting failures will
+    fail the build.
+- **Type checker**: mypy (strict settings enabled; see `mypy.ini`). Test
+  modules additionally require typed defs and calls (`disallow_untyped_defs`,
+  `disallow_untyped_calls` under `[mypy-test.*]`).
 - All Python source files must include the standard GPLv2 copyright header.
 - `pygit2/__init__.py` is large because it re-exports a large surface of
   constants and classes; follow existing patterns when adding new public
@@ -233,23 +237,27 @@ def f(a, b):
 GitHub Actions workflows live in `.github/workflows/`:
 
 - **`tests.yml`** — Runs on s390x via QEMU (`uraimo/run-on-arch-action`).
-  Allowed to fail; see issue #812.
+  Allowed to fail (`continue-on-error`); see issue #812.
 - **`lint.yml`** — Runs `ruff format --diff`, `ruff check`, and
   `sh build.sh mypy`.
-- **`wheels.yml`** — Uses `cibuildwheel` to build wheels for Linux (amd64,
-  arm64, ppc64le, musl), macOS (intel, arm64, PyPy), and Windows (x64, x86,
-  arm64). It also builds an sdist, runs a `twine check`, publishes to PyPI,
-  and creates a GitHub Release on version tags (`v*`).
+- **`wheels.yml`** — Uses `cibuildwheel` (`~=3.3`) to build wheels for Linux
+  (amd64, arm64, ppc64le and riscv64 via QEMU, musl), macOS (intel, arm64,
+  PyPy), and Windows (x64, x86, arm64). It also builds an sdist, runs a
+  `twine check` (skipped on version tags), publishes to PyPI, and creates a
+  GitHub Release on version tags (`v*`), with release notes parsed from
+  `CHANGELOG.md` by `.github/workflows/parse_release_notes.py`.
 - **`codespell.yml`** — Spell checking with the codespell action.
 
 The `cibuildwheel` configuration in `pyproject.toml` pins:
 
-- `LIBGIT2_VERSION="1.9.4"`
+- `LIBGIT2_VERSION="1.9.6"`
 - `LIBSSH2_VERSION="1.11.1"`
-- `OPENSSL_VERSION="3.5.4"`
+- `OPENSSL_VERSION="3.5.7"`
 
-and skips `*musllinux_ppc64le` plus testing on `*-*linux_ppc64le` and
-`pp*-macosx_arm64`.
+and skips `*musllinux_ppc64le` plus testing on `*-*linux_ppc64le`,
+`*-*linux_riscv64` and `pp*-macosx_arm64`. On Windows it uses the
+`Visual Studio 18 2026` CMake generator for x64/x86 and
+`Visual Studio 17 2022` for ARM64.
 
 ## Security Considerations
 
@@ -262,6 +270,11 @@ and skips `*musllinux_ppc64le` plus testing on `*-*linux_ppc64le` and
 - Valgrind support: see `docs/development.rst` and
   `misc/valgrind-python.supp` for memory-leak debugging instructions.
 
+## Git Commits
+
+- Commits created by an AI agent must end with the `Assisted-by:` trailer.
+  Human-authored commits do not need it.
+
 ## Useful Notes for Agents
 
 - **Do not assume libgit2 is installed globally.** Check for `LIBGIT2` or use
@@ -275,5 +288,6 @@ and skips `*musllinux_ppc64le` plus testing on `*-*linux_ppc64le` and
   extension. Keep it in sync when adding or changing low-level APIs.
 - **Header stub order matters**: `pygit2/_run.py` concatenates `decl/*.h` in a
   fixed list; add new stubs in the correct position if dependencies require it.
-- Run the full test suite and type checks before considering a change complete:
-  `sh build.sh test` and `sh build.sh mypy`.
+- Run the full test suite, type checks, and linting/formatting before
+  considering a change complete:
+  `sh build.sh test`, `sh build.sh mypy`, `ruff check .`, and `ruff format .`.

{pygit2-1.19.3 → pygit2-1.20.0}/AUTHORS.md

@@ -21,6 +21,7 @@ Authors:
     Nick Hynes
     Richard Möhn
     Xu Tao
+    Łukasz Langa
     Konstantin Baikov
     Matthew Duggan
     Matthew Gamble
@@ -30,7 +31,6 @@ Authors:
     Sriram Raghu
     Victor Garcia
     Yonggang Luo
-    Łukasz Langa
     Patrick Steinhardt
     Petr Hosek
     Tamir Bahar
@@ -44,6 +44,7 @@ Authors:
     Nabijacz Leweli
     Simon Cozens
     Vlad Temian
+    WANG Xuerui
     Brodie Rao
     Chad Dombrova
     Lukas Fleischer
@@ -65,7 +66,6 @@ Authors:
     Santiago Perez De Rosso
     Sebastian Thiel
     Thom Wiggers
-    WANG Xuerui
     William Manley
     Alexander Linne
     Alok Singhal
@@ -127,6 +127,7 @@ Authors:
     Masud Rahman
     Michael Sondergaard
     Natanael Arndt
+    Nick Williams
     Ondřej Nový
     Sarath Lakshman
     Steve Kieffer
@@ -242,6 +243,7 @@ Authors:
     Victor Florea
     Vladimir Rutsky
     Vruyr Gyolchanyan
+    William Bowers
     William Schueller
     Wim Jeantine-Glenn
     Yu Jianjian

{pygit2-1.19.3 → pygit2-1.20.0}/CHANGELOG.md

@@ -1,3 +1,55 @@
+# 1.20.0 (2026-08-08)
+
+- New `RemoteCallbacks.custom_headers()`
+  [#1465](https://github.com/libgit2/pygit2/pull/1465)
+
+- New rebase API: `Repository.rebase_init(...)`, `Repository.rebase_open(...)`,
+  `Rebase`, and `RebaseOperation`
+  [#1483](https://github.com/libgit2/pygit2/pull/1483)
+
+- Fix `Config.snapshot()` for non-repository configs, allow `PathLike` in
+  `Config.__init__()`, and improve config documentation
+  [#1468](https://github.com/libgit2/pygit2/pull/1468)
+
+- Fix `UnicodeDecodeError` with non-UTF-8 file paths in `Repository.status()`,
+  `DiffFile.path`, index paths, checkout callbacks, and related APIs
+  [#1451](https://github.com/libgit2/pygit2/issues/1451)
+  [#1469](https://github.com/libgit2/pygit2/pull/1469)
+
+- Fix `enums.CheckoutStrategy.CONFLICT_STYLE_ZDIFF3`, which was mistakenly
+  bound to the `DIFF3` constant
+  [#1483](https://github.com/libgit2/pygit2/pull/1483)
+
+- Fix crashes and reference-lifetime bugs in custom refdb backends
+  [#1471](https://github.com/libgit2/pygit2/issues/1471)
+  [#1474](https://github.com/libgit2/pygit2/issues/1474)
+  [#1475](https://github.com/libgit2/pygit2/issues/1475)
+  [#1476](https://github.com/libgit2/pygit2/issues/1476)
+
+- Update wheels to libgit2 1.9.6 and OpenSSL 3.5.7
+
+- Add riscv64 wheels
+  [#1463](https://github.com/libgit2/pygit2/pull/1463)
+
+Breaking changes:
+
+- Remove deprecated `pygit2.legacyenums` module and `GIT_*` constants,
+  use `pygit2.enums` instead
+
+- Remove deprecated support for passing `str` to `Repository.merge(...)`,
+  pass a `Commit`, `Oid`, or `Reference` object instead
+
+- `Repository.merge_file_from_index(...)` now returns `MergeFileResult` by
+  default; pass `use_deprecated=True` for the previous string return, now
+  deprecated.
+
+- Remove deprecated `Remote.ls_remotes(...)`, use `Remote.list_heads(...)`
+  instead
+
+- Remove `pygit2.to_bytes(...)` and `pygit2.to_str(...)`; they were undocumented
+  accidental public APIs
+
+
 # 1.19.3 (2026-06-13)
 
 - Memory fixes

pygit2-1.20.0/Makefile

@@ -0,0 +1,7 @@
+.PHONY: build html
+
+build:
+	OPENSSL_VERSION=3.5.7 LIBSSH2_VERSION=1.11.1 LIBGIT2_VERSION=1.9.6 sh build.sh
+
+html: build
+	make -C docs html

{pygit2-1.19.3 → pygit2-1.20.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pygit2
-Version: 1.19.3
+Version: 1.20.0
 Summary: Python bindings for libgit2.
 Home-page: https://github.com/libgit2/pygit2
 Maintainer: J. David Ibáñez

{pygit2-1.19.3 → pygit2-1.20.0}/build.sh

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

{pygit2-1.19.3 → pygit2-1.20.0}/pygit2/__init__.py

@@ -1,4 +1,4 @@
-# Copyright 2010-2025 The pygit2 contributors
+# Copyright 2010-2026 The pygit2 contributors
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2,
@@ -31,7 +31,7 @@ import os
 import typing
 
 # High level API
-from . import enums
+from . import enums, utils
 from ._build import __version__
 
 # Low level API
@@ -310,7 +310,6 @@ from .errors import Passthrough, check_error
 from .ffi import C, ffi
 from .filter import Filter
 from .index import Index, IndexEntry
-from .legacyenums import *
 from .options import (
     GIT_OPT_ADD_SSL_X509_CERT,
     GIT_OPT_DISABLE_PACK_KEEP_FILE_CHECKS,
@@ -361,12 +360,12 @@ from .options import (
     option,
 )
 from .packbuilder import PackBuilder
+from .rebase import Rebase, RebaseOperation
 from .remotes import Remote
 from .repository import Repository
 from .settings import Settings
 from .submodules import Submodule
 from .transaction import ReferenceTransaction
-from .utils import to_bytes, to_str
 
 # Features
 features = enums.Feature(C.git_libgit2_features())
@@ -431,32 +430,32 @@ def init_repository(
     options.mode = mode
 
     if workdir_path:
-        workdir_path_ref = ffi.new('char []', to_bytes(workdir_path))
+        workdir_path_ref = ffi.new('char []', utils.encode_fs_path(workdir_path))
         options.workdir_path = workdir_path_ref
 
     if description:
-        description_ref = ffi.new('char []', to_bytes(description))
+        description_ref = ffi.new('char []', utils.encode_string(description))
         options.description = description_ref
 
     if template_path:
-        template_path_ref = ffi.new('char []', to_bytes(template_path))
+        template_path_ref = ffi.new('char []', utils.encode_fs_path(template_path))
         options.template_path = template_path_ref
 
     if initial_head:
-        initial_head_ref = ffi.new('char []', to_bytes(initial_head))
+        initial_head_ref = ffi.new('char []', utils.encode_string(initial_head))
         options.initial_head = initial_head_ref
 
     if origin_url:
-        origin_url_ref = ffi.new('char []', to_bytes(origin_url))
+        origin_url_ref = ffi.new('char []', utils.encode_string(origin_url))
         options.origin_url = origin_url_ref
 
     # Call
     crepository = ffi.new('git_repository **')
-    err = C.git_repository_init_ext(crepository, to_bytes(path), options)
+    err = C.git_repository_init_ext(crepository, utils.encode_fs_path(path), options)
     check_error(err)
 
     # Ok
-    return Repository(to_str(path))
+    return Repository(utils.path_to_str(path))
 
 
 def clone_repository(
@@ -531,13 +530,17 @@ def clone_repository(
         opts.fetch_opts.depth = depth
 
         if checkout_branch:
-            checkout_branch_ref = ffi.new('char []', to_bytes(checkout_branch))
+            checkout_branch_ref = ffi.new(
+                'char []', utils.encode_string(checkout_branch)
+            )
             opts.checkout_branch = checkout_branch_ref
 
         with git_fetch_options(payload, opts=opts.fetch_opts):
             with git_proxy_options(payload, opts.fetch_opts.proxy_opts, proxy):
                 crepo = ffi.new('git_repository **')
-                err = C.git_clone(crepo, to_bytes(url), to_bytes(path), opts)
+                err = C.git_clone(
+                    crepo, utils.encode_string(url), utils.encode_fs_path(path), opts
+                )
                 payload.check_error(err)
 
     # Ok
@@ -560,7 +563,7 @@ def filter_unregister(name: str) -> None:
     if FilterList._is_filter_in_use(name):
         raise RuntimeError(f"filter still in use: '{name}'")
 
-    c_name = to_bytes(name)
+    c_name = utils.encode_string(name)
     err = C.git_filter_unregister(c_name)
     check_error(err)
 
@@ -915,71 +918,11 @@ __all__ = (
     'index',
     'Index',
     'IndexEntry',
-    'legacyenums',
-    'GIT_FEATURE_THREADS',
-    'GIT_FEATURE_HTTPS',
-    'GIT_FEATURE_SSH',
-    'GIT_FEATURE_NSEC',
-    'GIT_REPOSITORY_INIT_BARE',
-    'GIT_REPOSITORY_INIT_NO_REINIT',
-    'GIT_REPOSITORY_INIT_NO_DOTGIT_DIR',
-    'GIT_REPOSITORY_INIT_MKDIR',
-    'GIT_REPOSITORY_INIT_MKPATH',
-    'GIT_REPOSITORY_INIT_EXTERNAL_TEMPLATE',
-    'GIT_REPOSITORY_INIT_RELATIVE_GITLINK',
-    'GIT_REPOSITORY_INIT_SHARED_UMASK',
-    'GIT_REPOSITORY_INIT_SHARED_GROUP',
-    'GIT_REPOSITORY_INIT_SHARED_ALL',
-    'GIT_REPOSITORY_OPEN_NO_SEARCH',
-    'GIT_REPOSITORY_OPEN_CROSS_FS',
-    'GIT_REPOSITORY_OPEN_BARE',
-    'GIT_REPOSITORY_OPEN_NO_DOTGIT',
-    'GIT_REPOSITORY_OPEN_FROM_ENV',
-    'GIT_REPOSITORY_STATE_NONE',
-    'GIT_REPOSITORY_STATE_MERGE',
-    'GIT_REPOSITORY_STATE_REVERT',
-    'GIT_REPOSITORY_STATE_REVERT_SEQUENCE',
-    'GIT_REPOSITORY_STATE_CHERRYPICK',
-    'GIT_REPOSITORY_STATE_CHERRYPICK_SEQUENCE',
-    'GIT_REPOSITORY_STATE_BISECT',
-    'GIT_REPOSITORY_STATE_REBASE',
-    'GIT_REPOSITORY_STATE_REBASE_INTERACTIVE',
-    'GIT_REPOSITORY_STATE_REBASE_MERGE',
-    'GIT_REPOSITORY_STATE_APPLY_MAILBOX',
-    'GIT_REPOSITORY_STATE_APPLY_MAILBOX_OR_REBASE',
-    'GIT_ATTR_CHECK_FILE_THEN_INDEX',
-    'GIT_ATTR_CHECK_INDEX_THEN_FILE',
-    'GIT_ATTR_CHECK_INDEX_ONLY',
-    'GIT_ATTR_CHECK_NO_SYSTEM',
-    'GIT_ATTR_CHECK_INCLUDE_HEAD',
-    'GIT_ATTR_CHECK_INCLUDE_COMMIT',
-    'GIT_FETCH_PRUNE_UNSPECIFIED',
-    'GIT_FETCH_PRUNE',
-    'GIT_FETCH_NO_PRUNE',
-    'GIT_CHECKOUT_NOTIFY_NONE',
-    'GIT_CHECKOUT_NOTIFY_CONFLICT',
-    'GIT_CHECKOUT_NOTIFY_DIRTY',
-    'GIT_CHECKOUT_NOTIFY_UPDATED',
-    'GIT_CHECKOUT_NOTIFY_UNTRACKED',
-    'GIT_CHECKOUT_NOTIFY_IGNORED',
-    'GIT_CHECKOUT_NOTIFY_ALL',
-    'GIT_STASH_APPLY_PROGRESS_NONE',
-    'GIT_STASH_APPLY_PROGRESS_LOADING_STASH',
-    'GIT_STASH_APPLY_PROGRESS_ANALYZE_INDEX',
-    'GIT_STASH_APPLY_PROGRESS_ANALYZE_MODIFIED',
-    'GIT_STASH_APPLY_PROGRESS_ANALYZE_UNTRACKED',
-    'GIT_STASH_APPLY_PROGRESS_CHECKOUT_UNTRACKED',
-    'GIT_STASH_APPLY_PROGRESS_CHECKOUT_MODIFIED',
-    'GIT_STASH_APPLY_PROGRESS_DONE',
-    'GIT_CREDENTIAL_USERPASS_PLAINTEXT',
-    'GIT_CREDENTIAL_SSH_KEY',
-    'GIT_CREDENTIAL_SSH_CUSTOM',
-    'GIT_CREDENTIAL_DEFAULT',
-    'GIT_CREDENTIAL_SSH_INTERACTIVE',
-    'GIT_CREDENTIAL_USERNAME',
-    'GIT_CREDENTIAL_SSH_MEMORY',
     'packbuilder',
     'PackBuilder',
+    'rebase',
+    'Rebase',
+    'RebaseOperation',
     'refspec',
     'remotes',
     'Remote',
@@ -994,8 +937,6 @@ __all__ = (
     'transaction',
     'ReferenceTransaction',
     'utils',
-    'to_bytes',
-    'to_str',
     # __init__ module defined symbols
     'features',
     'LIBGIT2_VER',

{pygit2-1.19.3 → pygit2-1.20.0}/pygit2/_build.py

@@ -1,4 +1,4 @@
-# Copyright 2010-2025 The pygit2 contributors
+# Copyright 2010-2026 The pygit2 contributors
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2,
@@ -34,7 +34,7 @@ from pathlib import Path
 #
 # The version number of pygit2
 #
-__version__ = '1.19.3'
+__version__ = '1.20.0'
 
 
 #

{pygit2-1.19.3 → pygit2-1.20.0}/pygit2/_libgit2/ffi.pyi

@@ -1,4 +1,4 @@
-# Copyright 2010-2025 The pygit2 contributors
+# Copyright 2010-2026 The pygit2 contributors
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2,
@@ -87,10 +87,36 @@ class GitRepositoryC:
     # def _from_c(cls, ptr: 'GitRepositoryC', owned: bool) -> 'Repository': ...
     pass
 
+class GitRemoteCallbacksC:
+    # TODO: Several Anys need filling in
+    version: int
+    sideband_progress: Any
+    completion: Any
+    credentials: Any
+    certificate_check: Any
+    transfer_progress: Any
+    update_tips: Any
+    pack_progress: Any
+    push_transfer_progress: Any
+    push_update_reference: Any
+    push_negotiation: Any
+    transport: Any
+    remote_ready: Any
+    payload: Any
+    resolve_url: Any
+    update_refs: Any
+
 class GitFetchOptionsC:
     # TODO: FetchOptions exist in _pygit2.pyi
     # incomplete
     depth: int
+    callbacks: GitRemoteCallbacksC
+    custom_headers: GitStrrayC
+
+class GitPushOptionsC:
+    # TODO incomplete
+    callbacks: GitRemoteCallbacksC
+    custom_headers: GitStrrayC
 
 class GitSubmoduleC:
     pass
@@ -146,6 +172,9 @@ class GitBufC:
 class GitCheckoutOptionsC:
     # incomplete
     checkout_strategy: int
+    ancestor_label: ArrayC[char]
+    our_label: ArrayC[char]
+    their_label: ArrayC[char]
 
 class GitCommitC:
     pass
@@ -225,7 +254,11 @@ class GitRepositoryInitOptionsC:
     origin_url: ArrayC[char]
 
 class GitCloneOptionsC:
-    pass
+    # TODO: Several Anys need filling in
+    repository_cb: Any
+    repository_cb_payload: Any
+    remote_cb: Any
+    remote_cb_payload: Any
 
 class GitPackbuilderC:
     pass
@@ -241,6 +274,22 @@ class GitProxyOptionsC:
     # certificate_check
     # payload
 
+class GitRebaseC:
+    pass
+
+class GitRebaseOperationC:
+    type: int
+    id: GitOidC
+    exec: char_pointer
+
+class GitRebaseOptionsC:
+    version: int
+    quiet: int
+    inmemory: int
+    rewrite_notes_ref: ArrayC[char]
+    merge_options: GitMergeOptionsC
+    checkout_options: GitCheckoutOptionsC
+
 class GitRemoteC:
     pass
 
@@ -256,6 +305,8 @@ def new(a: Literal['git_repository **']) -> _Pointer[GitRepositoryC]: ...
 @overload
 def new(a: Literal['git_remote **']) -> _Pointer[GitRemoteC]: ...
 @overload
+def new(a: Literal['git_remote_callbacks *']) -> GitRemoteCallbacksC: ...
+@overload
 def new(a: Literal['git_transaction **']) -> _Pointer[GitTransactionC]: ...
 @overload
 def new(a: Literal['git_repository_init_options *']) -> GitRepositoryInitOptionsC: ...
@@ -276,8 +327,12 @@ def new(a: Literal['git_blob **']) -> _Pointer[GitBlobC]: ...
 @overload
 def new(a: Literal['git_clone_options *']) -> GitCloneOptionsC: ...
 @overload
+def new(a: Literal['git_fetch_options *']) -> GitFetchOptionsC: ...
+@overload
 def new(a: Literal['git_merge_options *']) -> GitMergeOptionsC: ...
 @overload
+def new(a: Literal['git_push_options *']) -> GitPushOptionsC: ...
+@overload
 def new(a: Literal['git_blame_options *']) -> GitBlameOptionsC: ...
 @overload
 def new(a: Literal['git_annotated_commit **']) -> _Pointer[GitAnnotatedCommitC]: ...
@@ -346,6 +401,12 @@ def new(a: Literal['git_stash_save_options *']) -> GitStashSaveOptionsC: ...
 @overload
 def new(a: Literal['git_strarray *']) -> GitStrrayC: ...
 @overload
+def new(a: Literal['git_rebase **']) -> _Pointer[GitRebaseC]: ...
+@overload
+def new(a: Literal['git_rebase_options *']) -> GitRebaseOptionsC: ...
+@overload
+def new(a: Literal['git_rebase_operation **']) -> _Pointer[GitRebaseOperationC]: ...
+@overload
 def new(a: Literal['git_tree **']) -> _Pointer[GitTreeC]: ...
 @overload
 def new(a: Literal['git_buf *'], b: tuple[NULL_TYPE, Literal[0]]) -> GitBufC: ...
@@ -364,6 +425,8 @@ def new(
     a: Literal['char *[]'], b: list[Any]
 ) -> ArrayC[char_pointer]: ...  # For string arrays
 def addressof(a: object, attribute: str) -> _Pointer[object]: ...
+def new_handle(a: T) -> _Pointer[T]: ...
+def gc(cdata: T, destructor: Any, size: int = ...) -> T: ...
 
 class buffer(bytes):
     def __init__(self, a: object) -> None: ...

{pygit2-1.19.3 → pygit2-1.20.0}/pygit2/_pygit2.pyi

@@ -599,7 +599,12 @@ class RefdbBackend:
     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
+        self,
+        old_name: str,
+        new_name: str,
+        force: bool,
+        who: Signature,
+        message: str | None,
     ) -> Reference: ...
     def write(
         self,

{pygit2-1.19.3 → pygit2-1.20.0}/pygit2/_run.py

@@ -1,4 +1,4 @@
-# Copyright 2010-2025 The pygit2 contributors
+# Copyright 2010-2026 The pygit2 contributors
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2,
@@ -74,6 +74,7 @@ h_files = [
     'graph.h',
     'index.h',
     'merge.h',
+    'rebase.h',
     'net.h',
     'refspec.h',
     'repository.h',

{pygit2-1.19.3 → pygit2-1.20.0}/pygit2/blame.py

@@ -1,4 +1,4 @@
-# Copyright 2010-2025 The pygit2 contributors
+# Copyright 2010-2026 The pygit2 contributors
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2,
@@ -30,7 +30,7 @@ from ._pygit2 import Oid, Repository, Signature
 
 # Import from pygit2
 from .ffi import C, ffi
-from .utils import GenericIterator
+from .utils import GenericIterator, decode_fs_path
 
 if TYPE_CHECKING:
     from ._libgit2.ffi import GitBlameC, GitHunkC, GitSignatureC
@@ -110,7 +110,7 @@ class BlameHunk:
         if not path:
             return None
 
-        return ffi.string(path).decode('utf-8')
+        return decode_fs_path(path)
 
 
 class Blame:

{pygit2-1.19.3 → pygit2-1.20.0}/pygit2/branches.py

@@ -1,4 +1,4 @@
-# Copyright 2010-2025 The pygit2 contributors
+# Copyright 2010-2026 The pygit2 contributors
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2,