pygit2 1.19.1__tar.gz → 1.19.2__tar.gz

{pygit2-1.19.1 → pygit2-1.19.2}/AUTHORS.md

@@ -138,6 +138,7 @@ Authors:
     Adam Spiers
     Adrien Nader
     Albin Söderström
+    Alexander Shadchin
     Alexandru Fikl
     Andrew Chin
     Andrew McNulty
@@ -182,6 +183,7 @@ Authors:
     Hugh Cole-Baker
     Isabella Stephens
     Jacob Swanson
+    Jah-yee
     Jasper Lievisse Adriaanse
     Jimisola Laursen
     Jiri Benc
@@ -237,6 +239,7 @@ Authors:
     Timo Röhling
     Victor Florea
     Vladimir Rutsky
+    Vruyr Gyolchanyan
     William Schueller
     Wim Jeantine-Glenn
     Yu Jianjian

{pygit2-1.19.1 → pygit2-1.19.2}/CHANGELOG.md

@@ -1,3 +1,22 @@
+# 1.19.2 (2026-03-29)
+
+- Fix refcount and error handling issues in `filter_register(...)`
+
+- Fix config with valueless keys
+  [#1457](https://github.com/libgit2/pygit2/pull/1457)
+
+- New `Repository.load_filter_list(...)` and `FilterList`
+  [#1444](https://github.com/libgit2/pygit2/pull/1444)
+
+- New `Odb.read_header(...)` and now `Odb.read(...)` returns `enums.ObjectType` instead of int
+  [#1450](https://github.com/libgit2/pygit2/pull/1450)
+
+- Build and CI fixes
+  [#1446](https://github.com/libgit2/pygit2/pull/1446)
+  [#1448](https://github.com/libgit2/pygit2/pull/1448)
+  [#1455](https://github.com/libgit2/pygit2/pull/1455)
+
+
 # 1.19.1 (2025-12-29)
 
 - Update wheels to libgit2 1.9.2 and OpenSSL 3.5

{pygit2-1.19.1 → pygit2-1.19.2}/PKG-INFO

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

{pygit2-1.19.1 → pygit2-1.19.2}/pygit2/__init__.py

@@ -286,7 +286,6 @@ from ._pygit2 import (
     _cache_enums,
     discover_repository,
     filter_register,
-    filter_unregister,
     hash,
     hashfile,
     init_file_backend,
@@ -545,6 +544,27 @@ def clone_repository(
     return Repository._from_c(crepo[0], owned=True)
 
 
+def filter_unregister(name: str) -> None:
+    """
+    Unregister the given filter.
+
+    Note that the filter registry is not thread safe. Any registering or
+    deregistering of filters should be done outside of any possible usage
+    of the filters.
+
+    In particular, any FilterLists that use the filter must have been garbage
+    collected before you can unregister the filter.
+    """
+    from .filter import FilterList
+
+    if FilterList._is_filter_in_use(name):
+        raise RuntimeError(f"filter still in use: '{name}'")
+
+    c_name = to_bytes(name)
+    err = C.git_filter_unregister(c_name)
+    check_error(err)
+
+
 tree_entry_key = functools.cmp_to_key(tree_entry_cmp)
 
 settings = Settings()
@@ -610,7 +630,6 @@ __all__ = (
     # Low Level API (not present in .pyi)
     'FilterSource',
     'filter_register',
-    'filter_unregister',
     'GIT_APPLY_LOCATION_BOTH',
     'GIT_APPLY_LOCATION_INDEX',
     'GIT_APPLY_LOCATION_WORKDIR',

{pygit2-1.19.1 → pygit2-1.19.2}/pygit2/_build.py

@@ -34,7 +34,7 @@ from pathlib import Path
 #
 # The version number of pygit2
 #
-__version__ = '1.19.1'
+__version__ = '1.19.2'
 
 
 #

{pygit2-1.19.1 → pygit2-1.19.2}/pygit2/_libgit2/ffi.pyi

@@ -123,6 +123,10 @@ class GitBlameC:
     # incomplete
     pass
 
+class GitBlobC:
+    # incomplete
+    pass
+
 class GitMergeOptionsC:
     file_favor: int
     flags: int
@@ -177,6 +181,10 @@ class GitDescribeOptionsC:
 class GitDescribeResultC:
     pass
 
+class GitFilterListC:
+    # opaque struct
+    pass
+
 class GitIndexC:
     pass
 
@@ -264,6 +272,8 @@ def new(a: Literal['git_oid *']) -> GitOidC: ...
 @overload
 def new(a: Literal['git_blame **']) -> _Pointer[GitBlameC]: ...
 @overload
+def new(a: Literal['git_blob **']) -> _Pointer[GitBlobC]: ...
+@overload
 def new(a: Literal['git_clone_options *']) -> GitCloneOptionsC: ...
 @overload
 def new(a: Literal['git_merge_options *']) -> GitMergeOptionsC: ...
@@ -318,6 +328,8 @@ def new(a: Literal['git_signature *']) -> GitSignatureC: ...
 @overload
 def new(a: Literal['git_signature **']) -> _Pointer[GitSignatureC]: ...
 @overload
+def new(a: Literal['git_filter_list **']) -> _Pointer[GitFilterListC]: ...
+@overload
 def new(a: Literal['int *']) -> int_c: ...
 @overload
 def new(a: Literal['int64_t *']) -> int64_t: ...

{pygit2-1.19.1 → pygit2-1.19.2}/pygit2/_pygit2.pyi

@@ -518,7 +518,8 @@ class Odb:
     def add_backend(self, backend: OdbBackend, priority: int) -> None: ...
     def add_disk_alternate(self, path: str | Path) -> None: ...
     def exists(self, oid: _OidArg) -> bool: ...
-    def read(self, oid: _OidArg) -> tuple[int, bytes]: ...
+    def read(self, oid: _OidArg) -> tuple[ObjectType, bytes]: ...
+    def read_header(self, oid: _OidArg) -> tuple[ObjectType, int]: ...
     def write(self, type: int, data: bytes | str) -> Oid: ...
     def __contains__(self, other: _OidArg) -> bool: ...
     def __iter__(self) -> Iterator[Oid]: ...  # Odb_as_iter
@@ -857,6 +858,5 @@ def reference_is_valid_name(refname: str) -> bool: ...
 def tree_entry_cmp(a: Object, b: Object) -> int: ...
 def _cache_enums() -> None: ...
 def filter_register(name: str, filter: type[Filter]) -> None: ...
-def filter_unregister(name: str) -> None: ...
 
 _OidArg = str | Oid

{pygit2-1.19.1 → pygit2-1.19.2}/pygit2/_run.py

@@ -77,6 +77,7 @@ h_files = [
     'net.h',
     'refspec.h',
     'repository.h',
+    'filter.h',
     'commit.h',
     'revert.h',
     'stash.h',
@@ -96,6 +97,7 @@ C_HEADER_SRC = '\n'.join(h_source)
 C_PREAMBLE = """\
 #include <git2.h>
 #include <git2/sys/repository.h>
+#include <git2/sys/filter.h>
 """
 
 # ffi

{pygit2-1.19.1 → pygit2-1.19.2}/pygit2/config.py

@@ -73,7 +73,7 @@ class ConfigIterator:
 
 
 class ConfigMultivarIterator(ConfigIterator):
-    def __next__(self) -> str:  # type: ignore[override]
+    def __next__(self) -> str | None:  # type: ignore[override]
         entry = self._next_entry()
         return entry.value
 
@@ -137,7 +137,7 @@ class Config:
 
         return True
 
-    def __getitem__(self, key: str | bytes) -> str:
+    def __getitem__(self, key: str | bytes) -> str | None:
         """
         When using the mapping interface, the value is returned as a string. In
         order to apply the git-config parsing rules, you can use
@@ -365,8 +365,8 @@ class ConfigEntry:
         return ffi.string(self._entry.name)
 
     @cached_property
-    def raw_value(self) -> bytes:
-        return ffi.string(self.c_value)
+    def raw_value(self) -> bytes | None:
+        return ffi.string(self.c_value) if self.c_value != ffi.NULL else None
 
     @cached_property
     def level(self) -> int:
@@ -379,6 +379,6 @@ class ConfigEntry:
         return self.raw_name.decode('utf-8')
 
     @property
-    def value(self) -> str:
+    def value(self) -> str | None:
         """The entry's value as a string."""
-        return self.raw_value.decode('utf-8')
+        return self.raw_value.decode('utf-8') if self.raw_value is not None else None

pygit2-1.19.2/pygit2/decl/filter.h

@@ -0,0 +1,49 @@
+typedef enum {
+	GIT_FILTER_TO_WORKTREE = ...,
+	GIT_FILTER_TO_ODB = ...,
+} git_filter_mode_t;
+
+typedef enum {
+	GIT_FILTER_DEFAULT = ...,
+	GIT_FILTER_ALLOW_UNSAFE = ...,
+	GIT_FILTER_NO_SYSTEM_ATTRIBUTES = ...,
+	GIT_FILTER_ATTRIBUTES_FROM_HEAD = ...,
+	GIT_FILTER_ATTRIBUTES_FROM_COMMIT = ...,
+} git_filter_flag_t;
+
+int git_filter_unregister(
+	const char *name);
+
+int git_filter_list_load(
+	git_filter_list **filters,
+	git_repository *repo,
+	git_blob *blob,
+	const char *path,
+	git_filter_mode_t mode,
+	uint32_t flags);
+
+int git_filter_list_contains(
+	git_filter_list *filters,
+	const char *name);
+
+int git_filter_list_apply_to_buffer(
+	git_buf *out,
+	git_filter_list *filters,
+	const char* in,
+	size_t in_len);
+
+int git_filter_list_apply_to_file(
+	git_buf *out,
+	git_filter_list *filters,
+	git_repository *repo,
+	const char *path);
+
+int git_filter_list_apply_to_blob(
+	git_buf *out,
+	git_filter_list *filters,
+	git_blob *blob);
+
+size_t git_filter_list_length(
+	const git_filter_list *fl);
+
+void git_filter_list_free(git_filter_list *filters);

{pygit2-1.19.1 → pygit2-1.19.2}/pygit2/decl/types.h

@@ -1,6 +1,8 @@
+typedef struct git_blob git_blob;
 typedef struct git_commit git_commit;
 typedef struct git_annotated_commit git_annotated_commit;
 typedef struct git_config git_config;
+typedef struct git_filter_list git_filter_list;
 typedef struct git_index git_index;
 typedef struct git_index_conflict_iterator git_index_conflict_iterator;
 typedef struct git_object git_object;

{pygit2-1.19.1 → pygit2-1.19.2}/pygit2/filter.py

@@ -23,9 +23,20 @@
 # the Free Software Foundation, 51 Franklin Street, Fifth Floor,
 # Boston, MA 02110-1301, USA.
 
+from __future__ import annotations
+
+import weakref
 from collections.abc import Callable
+from typing import TYPE_CHECKING
+
+from ._pygit2 import Blob, FilterSource
+from .errors import check_error
+from .ffi import C, ffi
+from .utils import to_bytes
 
-from ._pygit2 import FilterSource
+if TYPE_CHECKING:
+    from ._libgit2.ffi import GitFilterListC
+    from .repository import BaseRepository
 
 
 class Filter:
@@ -107,3 +118,90 @@ class Filter:
                 Any remaining filtered output data must be written to
                 `write_next` before returning.
         """
+
+
+class FilterList:
+    _all_filter_lists: set[weakref.ReferenceType[FilterList]] = set()
+
+    _pointer: GitFilterListC
+
+    @classmethod
+    def _from_c(cls, ptr: GitFilterListC):
+        if ptr == ffi.NULL:
+            return None
+
+        fl = cls.__new__(cls)
+        fl._pointer = ptr
+
+        # Keep track of this FilterList until it's garbage collected. This lets
+        # `filter_unregister` ensure the user isn't trying to delete a filter
+        # that's still in use.
+        ref = weakref.ref(fl, FilterList._all_filter_lists.remove)
+        FilterList._all_filter_lists.add(ref)
+
+        return fl
+
+    @classmethod
+    def _is_filter_in_use(cls, name: str) -> bool:
+        for ref in cls._all_filter_lists:
+            fl = ref()
+            if fl is not None and name in fl:
+                return True
+        return False
+
+    def __contains__(self, name: str) -> bool:
+        if not isinstance(name, str):
+            raise TypeError('argument must be str')
+        c_name = to_bytes(name)
+        result = C.git_filter_list_contains(self._pointer, c_name)
+        return bool(result)
+
+    def __len__(self) -> int:
+        return C.git_filter_list_length(self._pointer)
+
+    def apply_to_buffer(self, data: bytes) -> bytes:
+        """
+        Apply a filter list to a data buffer.
+        Return the filtered contents.
+        """
+        buf = ffi.new('git_buf *')
+        err = C.git_filter_list_apply_to_buffer(buf, self._pointer, data, len(data))
+        check_error(err)
+        try:
+            return ffi.string(buf.ptr)
+        finally:
+            C.git_buf_dispose(buf)
+
+    def apply_to_file(self, repo: BaseRepository, path: str) -> bytes:
+        """
+        Apply a filter list to the contents of a file on disk.
+        Return the filtered contents.
+        """
+        buf = ffi.new('git_buf *')
+        c_path = to_bytes(path)
+        err = C.git_filter_list_apply_to_file(buf, self._pointer, repo._repo, c_path)
+        check_error(err)
+        try:
+            return ffi.string(buf.ptr)
+        finally:
+            C.git_buf_dispose(buf)
+
+    def apply_to_blob(self, blob: Blob) -> bytes:
+        """
+        Apply a filter list to a data buffer.
+        Return the filtered contents.
+        """
+        buf = ffi.new('git_buf *')
+
+        c_blob = ffi.new('git_blob **')
+        ffi.buffer(c_blob)[:] = blob._pointer[:]
+
+        err = C.git_filter_list_apply_to_blob(buf, self._pointer, c_blob[0])
+        check_error(err)
+        try:
+            return ffi.string(buf.ptr)
+        finally:
+            C.git_buf_dispose(buf)
+
+    def __del__(self):
+        C.git_filter_list_free(self._pointer)

{pygit2-1.19.1 → pygit2-1.19.2}/pygit2/repository.py

@@ -64,6 +64,7 @@ from .enums import (
     DescribeStrategy,
     DiffOption,
     FileMode,
+    FilterMode,
     MergeFavor,
     MergeFileFlag,
     MergeFlag,
@@ -73,6 +74,7 @@ from .enums import (
 )
 from .errors import check_error
 from .ffi import C, ffi
+from .filter import FilterList
 from .index import Index, IndexEntry, MergeFileResult
 from .packbuilder import PackBuilder
 from .references import References
@@ -235,6 +237,31 @@ class BaseRepository(_Repository):
         oid = Oid(raw=bytes(ffi.buffer(c_oid.id)[:]))
         return oid
 
+    def load_filter_list(
+        self, path: str, mode: FilterMode = FilterMode.TO_ODB
+    ) -> FilterList | None:
+        """
+        Load the filter list for a given path.
+        May return None if there are no filters to apply to this path.
+
+        Parameters:
+
+        path
+            Relative path of the file to be filtered
+
+        mode
+            Filtering direction: ODB to worktree (SMUDGE), or worktree to ODB
+            (CLEAN).
+        """
+        c_filters = ffi.new('git_filter_list **')
+        c_path = to_bytes(path)
+        c_mode = int(mode)
+
+        err = C.git_filter_list_load(c_filters, self._repo, ffi.NULL, c_path, c_mode, 0)
+        check_error(err)
+        fl = FilterList._from_c(c_filters[0])
+        return fl
+
     def __iter__(self) -> Iterator[Oid]:
         return iter(self.odb)
 

{pygit2-1.19.1 → pygit2-1.19.2}/pyproject.toml

@@ -1,5 +1,6 @@
 [build-system]
-requires = ["setuptools", "wheel"]
+requires = ["setuptools"]
+build-backend = "setuptools.build_meta"
 
 [tool.cibuildwheel]
 enable = ["pypy"]

{pygit2-1.19.1 → pygit2-1.19.2}/src/branch.c

@@ -275,7 +275,7 @@ Branch_upstream_name__get__(Branch *self)
 }
 
 
-PyMethodDef Branch_methods[] = {
+static PyMethodDef Branch_methods[] = {
     METHOD(Branch, delete, METH_NOARGS),
     METHOD(Branch, is_head, METH_NOARGS),
     METHOD(Branch, is_checked_out, METH_NOARGS),

{pygit2-1.19.1 → pygit2-1.19.2}/src/diff.c

@@ -236,7 +236,7 @@ PyMemberDef DiffFile_members[] = {
     {NULL}
 };
 
-PyMethodDef DiffFile_methods[] = {
+static PyMethodDef DiffFile_methods[] = {
     METHOD(DiffFile, from_c, METH_STATIC | METH_O),
     {NULL},
 };
@@ -914,7 +914,7 @@ DiffStats_dealloc(DiffStats *self)
     PyObject_Del(self);
 }
 
-PyMethodDef DiffStats_methods[] = {
+static PyMethodDef DiffStats_methods[] = {
     METHOD(DiffStats, format, METH_VARARGS | METH_KEYWORDS),
     {NULL}
 };

{pygit2-1.19.1 → pygit2-1.19.2}/src/filter.c

@@ -551,7 +551,9 @@ void pygit2_filter_cleanup(git_filter *self, void *payload)
 void pygit2_filter_shutdown(git_filter *self)
 {
     pygit2_filter *filter = (pygit2_filter *)self;
+
     PyGILState_STATE gil = PyGILState_Ensure();
+    free((void*)filter->filter.attributes);
     Py_DECREF(filter->py_filter_cls);
     free(filter);
     PyGILState_Release(gil);

{pygit2-1.19.1 → pygit2-1.19.2}/src/mailmap.c

@@ -188,7 +188,7 @@ Mailmap_dealloc(Mailmap *self)
 }
 
 
-PyMethodDef Mailmap_methods[] = {
+static PyMethodDef Mailmap_methods[] = {
     METHOD(Mailmap, add_entry, METH_VARARGS | METH_KEYWORDS),
     METHOD(Mailmap, resolve, METH_VARARGS),
     METHOD(Mailmap, resolve_signature, METH_VARARGS),

{pygit2-1.19.1 → pygit2-1.19.2}/src/note.c

@@ -99,7 +99,7 @@ Note_dealloc(Note *self)
 }
 
 
-PyMethodDef Note_methods[] = {
+static PyMethodDef Note_methods[] = {
     METHOD(Note, remove, METH_VARARGS),
     {NULL}
 };

{pygit2-1.19.1 → pygit2-1.19.2}/src/object.c

@@ -302,7 +302,7 @@ PyGetSetDef Object_getseters[] = {
     {NULL}
 };
 
-PyMethodDef Object_methods[] = {
+static PyMethodDef Object_methods[] = {
     METHOD(Object, read_raw, METH_NOARGS),
     METHOD(Object, peel, METH_O),
     {NULL}

{pygit2-1.19.1 → pygit2-1.19.2}/src/odb.c

@@ -37,6 +37,8 @@
 
 extern PyTypeObject OdbBackendType;
 
+extern PyObject *ObjectTypeEnum;
+
 static git_otype
 int_to_loose_object_type(int type_id)
 {
@@ -170,7 +172,7 @@ Odb_read_raw(git_odb *odb, const git_oid *oid, size_t len)
 }
 
 PyDoc_STRVAR(Odb_read__doc__,
-  "read(oid) -> type, data, size\n"
+  "read(oid: Oid) -> tuple[enums.ObjectType, bytes]\n"
   "\n"
   "Read raw object data from the object db.");
 
@@ -180,6 +182,8 @@ Odb_read(Odb *self, PyObject *py_hex)
     git_oid oid;
     git_odb_object *obj;
     size_t len;
+    git_object_t type;
+    PyObject* type_enum;
     PyObject* tuple;
 
     len = py_oid_to_git_oid(py_hex, &oid);
@@ -190,9 +194,13 @@ Odb_read(Odb *self, PyObject *py_hex)
     if (obj == NULL)
         return NULL;
 
+    // Convert type to ObjectType enum
+    type = git_odb_object_type(obj);
+    type_enum = pygit2_enum(ObjectTypeEnum, type);
+
     tuple = Py_BuildValue(
-        "(ny#)",
-        git_odb_object_type(obj),
+        "(Oy#)",
+        type_enum,
         git_odb_object_data(obj),
         git_odb_object_size(obj));
 
@@ -200,6 +208,44 @@ Odb_read(Odb *self, PyObject *py_hex)
     return tuple;
 }
 
+PyDoc_STRVAR(Odb_read_header__doc__,
+    "read_header(oid: Oid) -> tuple[enums.ObjectType, size\n"
+    "\n"
+    "Read the header of an object from the database, without reading its full\n"
+    "contents.\n"
+    "\n"
+    "The header includes the type and the length of an object.\n"
+    "\n"
+    "Note that most backends do not support reading only the header of an object,\n"
+    "so the whole object may be read and then the header will be returned.");
+
+PyObject *
+Odb_read_header(Odb *self, PyObject *py_hex)
+{
+    git_oid oid;
+    int err;
+    size_t len;
+    git_object_t type;
+    PyObject* type_enum;
+    PyObject* tuple;
+
+    len = py_oid_to_git_oid(py_hex, &oid);
+    if (len == 0)
+        return NULL;
+
+    err = git_odb_read_header(&len, &type, self->odb, &oid);
+    if (err != 0) {
+        Error_set_oid(err, &oid, len);
+        return NULL;
+    }
+
+    // Convert type to ObjectType enum
+    type_enum = pygit2_enum(ObjectTypeEnum, type);
+
+    tuple = Py_BuildValue("(On)", type_enum, len);
+    return tuple;
+}
+
 PyDoc_STRVAR(Odb_write__doc__,
     "write(type: int, data: bytes) -> Oid\n"
     "\n"
@@ -298,9 +344,10 @@ Odb_add_backend(Odb *self, PyObject *args)
 }
 
 
-PyMethodDef Odb_methods[] = {
+static PyMethodDef Odb_methods[] = {
     METHOD(Odb, add_disk_alternate, METH_O),
     METHOD(Odb, read, METH_O),
+    METHOD(Odb, read_header, METH_O),
     METHOD(Odb, write, METH_VARARGS),
     METHOD(Odb, exists, METH_O),
     METHOD(Odb, add_backend, METH_VARARGS),

{pygit2-1.19.1 → pygit2-1.19.2}/src/odb_backend.c

@@ -518,7 +518,7 @@ OdbBackend_refresh(OdbBackend *self)
  * - readstream
  * - freshen
  */
-PyMethodDef OdbBackend_methods[] = {
+static PyMethodDef OdbBackend_methods[] = {
     METHOD(OdbBackend, read, METH_O),
     METHOD(OdbBackend, read_prefix, METH_O),
     METHOD(OdbBackend, read_header, METH_O),

{pygit2-1.19.1 → pygit2-1.19.2}/src/patch.c

@@ -235,7 +235,7 @@ Patch_hunks__get__(Patch *self)
 }
 
 
-PyMethodDef Patch_methods[] = {
+static PyMethodDef Patch_methods[] = {
     {"create_from", (PyCFunction) Patch_create_from,
       METH_KEYWORDS | METH_VARARGS | METH_STATIC, Patch_create_from__doc__},
     {NULL}