Move option handling to CFFI

Author: ambv

.gitignore

@@ -13,3 +13,5 @@ __pycache__/
 *.pyc
 *.so
 *.swp
+/pygit2/_libgit2.c
+/pygit2/_libgit2.o

build.sh

@@ -178,7 +178,7 @@ if [ -n "$LIBGIT2_VERSION" ]; then
     wget https://github.com/libgit2/libgit2/archive/refs/tags/v$LIBGIT2_VERSION.tar.gz -N -O $FILENAME.tar.gz
     tar xf $FILENAME.tar.gz
     cd $FILENAME
-    mkdir build -p
+    mkdir -p build
     cd build
     if [ "$KERNEL" = "Darwin" ] && [ "$CIBUILDWHEEL" = "1" ]; then
         CMAKE_PREFIX_PATH=$OPENSSL_PREFIX:$PREFIX cmake .. \

pygit2/__init__.py

@@ -191,38 +191,6 @@
     GIT_OID_HEXSZ,
     GIT_OID_MINPREFIXLEN,
     GIT_OID_RAWSZ,
-    GIT_OPT_DISABLE_PACK_KEEP_FILE_CHECKS,
-    GIT_OPT_ENABLE_CACHING,
-    GIT_OPT_ENABLE_FSYNC_GITDIR,
-    GIT_OPT_ENABLE_OFS_DELTA,
-    GIT_OPT_ENABLE_STRICT_HASH_VERIFICATION,
-    GIT_OPT_ENABLE_STRICT_OBJECT_CREATION,
-    GIT_OPT_ENABLE_STRICT_SYMBOLIC_REF_CREATION,
-    GIT_OPT_ENABLE_UNSAVED_INDEX_SAFETY,
-    GIT_OPT_GET_CACHED_MEMORY,
-    GIT_OPT_GET_MWINDOW_FILE_LIMIT,
-    GIT_OPT_GET_MWINDOW_MAPPED_LIMIT,
-    GIT_OPT_GET_MWINDOW_SIZE,
-    GIT_OPT_GET_OWNER_VALIDATION,
-    GIT_OPT_GET_PACK_MAX_OBJECTS,
-    GIT_OPT_GET_SEARCH_PATH,
-    GIT_OPT_GET_TEMPLATE_PATH,
-    GIT_OPT_GET_USER_AGENT,
-    GIT_OPT_GET_WINDOWS_SHAREMODE,
-    GIT_OPT_SET_ALLOCATOR,
-    GIT_OPT_SET_CACHE_MAX_SIZE,
-    GIT_OPT_SET_CACHE_OBJECT_LIMIT,
-    GIT_OPT_SET_MWINDOW_FILE_LIMIT,
-    GIT_OPT_SET_MWINDOW_MAPPED_LIMIT,
-    GIT_OPT_SET_MWINDOW_SIZE,
-    GIT_OPT_SET_OWNER_VALIDATION,
-    GIT_OPT_SET_PACK_MAX_OBJECTS,
-    GIT_OPT_SET_SEARCH_PATH,
-    GIT_OPT_SET_SSL_CERT_LOCATIONS,
-    GIT_OPT_SET_SSL_CIPHERS,
-    GIT_OPT_SET_TEMPLATE_PATH,
-    GIT_OPT_SET_USER_AGENT,
-    GIT_OPT_SET_WINDOWS_SHAREMODE,
     GIT_REFERENCES_ALL,
     GIT_REFERENCES_BRANCHES,
     GIT_REFERENCES_TAGS,
@@ -322,12 +290,46 @@
     hash,
     hashfile,
     init_file_backend,
-    option,
     reference_is_valid_name,
     tree_entry_cmp,
 )
 from .blame import Blame, BlameHunk
 from .blob import BlobIO
+from .options import (
+    option,
+    GIT_OPT_DISABLE_PACK_KEEP_FILE_CHECKS,
+    GIT_OPT_ENABLE_CACHING,
+    GIT_OPT_ENABLE_FSYNC_GITDIR,
+    GIT_OPT_ENABLE_OFS_DELTA,
+    GIT_OPT_ENABLE_STRICT_HASH_VERIFICATION,
+    GIT_OPT_ENABLE_STRICT_OBJECT_CREATION,
+    GIT_OPT_ENABLE_STRICT_SYMBOLIC_REF_CREATION,
+    GIT_OPT_ENABLE_UNSAVED_INDEX_SAFETY,
+    GIT_OPT_GET_CACHED_MEMORY,
+    GIT_OPT_GET_MWINDOW_FILE_LIMIT,
+    GIT_OPT_GET_MWINDOW_MAPPED_LIMIT,
+    GIT_OPT_GET_MWINDOW_SIZE,
+    GIT_OPT_GET_OWNER_VALIDATION,
+    GIT_OPT_GET_PACK_MAX_OBJECTS,
+    GIT_OPT_GET_SEARCH_PATH,
+    GIT_OPT_GET_TEMPLATE_PATH,
+    GIT_OPT_GET_USER_AGENT,
+    GIT_OPT_GET_WINDOWS_SHAREMODE,
+    GIT_OPT_SET_ALLOCATOR,
+    GIT_OPT_SET_CACHE_MAX_SIZE,
+    GIT_OPT_SET_CACHE_OBJECT_LIMIT,
+    GIT_OPT_SET_MWINDOW_FILE_LIMIT,
+    GIT_OPT_SET_MWINDOW_MAPPED_LIMIT,
+    GIT_OPT_SET_MWINDOW_SIZE,
+    GIT_OPT_SET_OWNER_VALIDATION,
+    GIT_OPT_SET_PACK_MAX_OBJECTS,
+    GIT_OPT_SET_SEARCH_PATH,
+    GIT_OPT_SET_SSL_CERT_LOCATIONS,
+    GIT_OPT_SET_SSL_CIPHERS,
+    GIT_OPT_SET_TEMPLATE_PATH,
+    GIT_OPT_SET_USER_AGENT,
+    GIT_OPT_SET_WINDOWS_SHAREMODE,
+)
 from .callbacks import (
     CheckoutCallbacks,
     Payload,

pygit2/_libgit2/ffi.pyi

@@ -42,6 +42,9 @@ class int_c:
 class int64_t:
     def __getitem__(self, item: Literal[0]) -> int: ...
 
+class ssize_t:
+    def __getitem__(self, item: Literal[0]) -> int: ...
+
 class _Pointer(Generic[T]):
     def __setitem__(self, item: Literal[0], a: T) -> None: ...
     @overload
@@ -319,6 +322,8 @@ def new(
 @overload
 def new(a: Literal['size_t *', 'size_t*']) -> size_t: ...
 @overload
+def new(a: Literal['ssize_t *', 'ssize_t*']) -> ssize_t: ...
+@overload
 def new(a: Literal['git_stash_save_options *']) -> GitStashSaveOptionsC: ...
 @overload
 def new(a: Literal['git_strarray *']) -> GitStrrayC: ...
@@ -340,4 +345,9 @@ class buffer(bytes):
     @overload
     def __getitem__(self, item: slice[Any, Any, Any]) -> bytes: ...
 
+@overload
 def cast(a: Literal['int'], b: object) -> int: ...
+@overload
+def cast(a: Literal['size_t'], b: object) -> int: ...
+@overload
+def cast(a: Literal['ssize_t'], b: object) -> int: ...

pygit2/_pygit2.pyi

@@ -52,38 +52,6 @@ LIBGIT2_VER_MAJOR: int
 LIBGIT2_VER_MINOR: int
 LIBGIT2_VER_REVISION: int
 LIBGIT2_VERSION: str
-GIT_OPT_GET_MWINDOW_SIZE: int
-GIT_OPT_SET_MWINDOW_SIZE: int
-GIT_OPT_GET_MWINDOW_MAPPED_LIMIT: int
-GIT_OPT_SET_MWINDOW_MAPPED_LIMIT: int
-GIT_OPT_GET_SEARCH_PATH: int
-GIT_OPT_SET_SEARCH_PATH: int
-GIT_OPT_SET_CACHE_OBJECT_LIMIT: int
-GIT_OPT_SET_CACHE_MAX_SIZE: int
-GIT_OPT_ENABLE_CACHING: int
-GIT_OPT_GET_CACHED_MEMORY: int
-GIT_OPT_GET_TEMPLATE_PATH: int
-GIT_OPT_SET_TEMPLATE_PATH: int
-GIT_OPT_SET_SSL_CERT_LOCATIONS: int
-GIT_OPT_SET_USER_AGENT: int
-GIT_OPT_ENABLE_STRICT_OBJECT_CREATION: int
-GIT_OPT_ENABLE_STRICT_SYMBOLIC_REF_CREATION: int
-GIT_OPT_SET_SSL_CIPHERS: int
-GIT_OPT_GET_USER_AGENT: int
-GIT_OPT_ENABLE_OFS_DELTA: int
-GIT_OPT_ENABLE_FSYNC_GITDIR: int
-GIT_OPT_GET_WINDOWS_SHAREMODE: int
-GIT_OPT_SET_WINDOWS_SHAREMODE: int
-GIT_OPT_ENABLE_STRICT_HASH_VERIFICATION: int
-GIT_OPT_SET_ALLOCATOR: int
-GIT_OPT_ENABLE_UNSAVED_INDEX_SAFETY: int
-GIT_OPT_GET_PACK_MAX_OBJECTS: int
-GIT_OPT_SET_PACK_MAX_OBJECTS: int
-GIT_OPT_DISABLE_PACK_KEEP_FILE_CHECKS: int
-GIT_OPT_GET_OWNER_VALIDATION: int
-GIT_OPT_SET_OWNER_VALIDATION: int
-GIT_OPT_GET_MWINDOW_FILE_LIMIT: int
-GIT_OPT_SET_MWINDOW_FILE_LIMIT: int
 GIT_OID_RAWSZ: int
 GIT_OID_HEXSZ: int
 GIT_OID_HEX_ZERO: str
@@ -887,79 +855,6 @@ def discover_repository(
 def hash(data: bytes | str) -> Oid: ...
 def hashfile(path: str) -> Oid: ...
 def init_file_backend(path: str, flags: int = 0) -> object: ...
-@overload
-def option(
-    opt: Literal[
-        Option.GET_MWINDOW_FILE_LIMIT,
-        Option.GET_MWINDOW_MAPPED_LIMIT,
-        Option.GET_MWINDOW_SIZE,
-    ],
-) -> int: ...
-@overload
-def option(
-    opt: Literal[
-        Option.SET_MWINDOW_FILE_LIMIT,
-        Option.SET_MWINDOW_MAPPED_LIMIT,
-        Option.SET_MWINDOW_SIZE,
-    ],
-    value: int,
-) -> None: ...
-@overload
-def option(opt: Literal[Option.GET_SEARCH_PATH], level: ConfigLevel) -> str: ...
-@overload
-def option(
-    opt: Literal[Option.SET_SEARCH_PATH], level: ConfigLevel, value: str
-) -> None: ...
-@overload
-def option(
-    opt: Literal[Option.SET_CACHE_OBJECT_LIMIT], object_type: ObjectType, limit: int
-) -> None: ...
-@overload
-def option(opt: Literal[Option.SET_CACHE_MAX_SIZE], max_size: int) -> None: ...
-@overload
-def option(opt: Literal[Option.GET_CACHED_MEMORY]) -> tuple[int, int]: ...
-
-# not implemented:
-# Option.GET_TEMPLATE_PATH
-# Option.SET_TEMPLATE_PATH
-
-@overload
-def option(
-    opt: Literal[Option.SET_SSL_CERT_LOCATIONS],
-    file: str | bytes | None,
-    dir: str | bytes | None,
-) -> None: ...
-
-# not implemented:
-# Option.SET_USER_AGENT
-
-@overload
-def option(
-    opt: Literal[
-        Option.ENABLE_CACHING,
-        Option.ENABLE_STRICT_OBJECT_CREATION,
-        Option.ENABLE_STRICT_SYMBOLIC_REF_CREATION,
-        Option.ENABLE_OFS_DELTA,
-        Option.ENABLE_FSYNC_GITDIR,
-        Option.ENABLE_STRICT_HASH_VERIFICATION,
-        Option.ENABLE_UNSAVED_INDEX_SAFETY,
-        Option.DISABLE_PACK_KEEP_FILE_CHECKS,
-        Option.SET_OWNER_VALIDATION,
-    ],
-    value: bool | Literal[0, 1],
-) -> None: ...
-@overload
-def option(opt: Literal[Option.GET_OWNER_VALIDATION]) -> int: ...
-
-# not implemented:
-# Option.SET_SSL_CIPHERS
-# Option.GET_USER_AGENT
-# Option.GET_WINDOWS_SHAREMODE
-# Option.SET_WINDOWS_SHAREMODE
-# Option.SET_ALLOCATOR
-# Option.GET_PACK_MAX_OBJECTS
-# Option.SET_PACK_MAX_OBJECTS
-
 def reference_is_valid_name(refname: str) -> bool: ...
 def tree_entry_cmp(a: Object, b: Object) -> int: ...
 def _cache_enums() -> None: ...

pygit2/_run.py

@@ -81,6 +81,7 @@
     'revert.h',
     'stash.h',
     'submodule.h',
+    'options.h',
     'callbacks.h',  # Bridge from libgit2 to Python
 ]
 h_source = []

pygit2/decl/options.h

@@ -0,0 +1,50 @@
+typedef enum {
+	GIT_OPT_GET_MWINDOW_SIZE,
+	GIT_OPT_SET_MWINDOW_SIZE,
+	GIT_OPT_GET_MWINDOW_MAPPED_LIMIT,
+	GIT_OPT_SET_MWINDOW_MAPPED_LIMIT,
+	GIT_OPT_GET_SEARCH_PATH,
+	GIT_OPT_SET_SEARCH_PATH,
+	GIT_OPT_SET_CACHE_OBJECT_LIMIT,
+	GIT_OPT_SET_CACHE_MAX_SIZE,
+	GIT_OPT_ENABLE_CACHING,
+	GIT_OPT_GET_CACHED_MEMORY,
+	GIT_OPT_GET_TEMPLATE_PATH,
+	GIT_OPT_SET_TEMPLATE_PATH,
+	GIT_OPT_SET_SSL_CERT_LOCATIONS,
+	GIT_OPT_SET_USER_AGENT,
+	GIT_OPT_ENABLE_STRICT_OBJECT_CREATION,
+	GIT_OPT_ENABLE_STRICT_SYMBOLIC_REF_CREATION,
+	GIT_OPT_SET_SSL_CIPHERS,
+	GIT_OPT_GET_USER_AGENT,
+	GIT_OPT_ENABLE_OFS_DELTA,
+	GIT_OPT_ENABLE_FSYNC_GITDIR,
+	GIT_OPT_GET_WINDOWS_SHAREMODE,
+	GIT_OPT_SET_WINDOWS_SHAREMODE,
+	GIT_OPT_ENABLE_STRICT_HASH_VERIFICATION,
+	GIT_OPT_SET_ALLOCATOR,
+	GIT_OPT_ENABLE_UNSAVED_INDEX_SAFETY,
+	GIT_OPT_GET_PACK_MAX_OBJECTS,
+	GIT_OPT_SET_PACK_MAX_OBJECTS,
+	GIT_OPT_DISABLE_PACK_KEEP_FILE_CHECKS,
+	GIT_OPT_ENABLE_HTTP_EXPECT_CONTINUE,
+	GIT_OPT_GET_MWINDOW_FILE_LIMIT,
+	GIT_OPT_SET_MWINDOW_FILE_LIMIT,
+	GIT_OPT_SET_ODB_PACKED_PRIORITY,
+	GIT_OPT_SET_ODB_LOOSE_PRIORITY,
+	GIT_OPT_GET_EXTENSIONS,
+	GIT_OPT_SET_EXTENSIONS,
+	GIT_OPT_GET_OWNER_VALIDATION,
+	GIT_OPT_SET_OWNER_VALIDATION,
+	GIT_OPT_GET_HOMEDIR,
+	GIT_OPT_SET_HOMEDIR,
+	GIT_OPT_SET_SERVER_CONNECT_TIMEOUT,
+	GIT_OPT_GET_SERVER_CONNECT_TIMEOUT,
+	GIT_OPT_SET_SERVER_TIMEOUT,
+	GIT_OPT_GET_SERVER_TIMEOUT,
+	GIT_OPT_SET_USER_AGENT_PRODUCT,
+	GIT_OPT_GET_USER_AGENT_PRODUCT,
+	GIT_OPT_ADD_SSL_X509_CERT
+} git_libgit2_opt_t;
+
+int git_libgit2_opts(int option, ...);