rewrite filter/stream callbacks in C

Author: pmrowla

pygit2/__init__.py

@@ -38,7 +38,7 @@
 from .credentials import *
 from .errors import check_error, Passthrough
 from .ffi import ffi, C
-from .filter import Filter, FilterSource, filter_register, filter_unregister
+from .filter import Filter
 from .index import Index, IndexEntry
 from .remote import Remote
 from .repository import Repository
@@ -119,18 +119,6 @@
 GIT_STASH_APPLY_PROGRESS_CHECKOUT_MODIFIED  : int = C.GIT_STASH_APPLY_PROGRESS_CHECKOUT_MODIFIED
 GIT_STASH_APPLY_PROGRESS_DONE               : int = C.GIT_STASH_APPLY_PROGRESS_DONE
 
-# GIT_FILTER
-GIT_FILTER_TO_WORKTREE              : int = C.GIT_FILTER_TO_WORKTREE
-GIT_FILTER_SMUDGE                   : int = C.GIT_FILTER_SMUDGE
-GIT_FILTER_TO_ODB                   : int = C.GIT_FILTER_TO_ODB
-GIT_FILTER_CLEAN                    : int = C.GIT_FILTER_CLEAN
-GIT_FILTER_DRIVER_PRIORITY          : int = C.GIT_FILTER_DRIVER_PRIORITY
-GIT_FILTER_DEFAULT                  : int = C.GIT_FILTER_DEFAULT
-GIT_FILTER_ALLOW_UNSAFE             : int = C.GIT_FILTER_ALLOW_UNSAFE
-GIT_FILTER_NO_SYSTEM_ATTRIBUTES     : int = C.GIT_FILTER_NO_SYSTEM_ATTRIBUTES
-GIT_FILTER_ATTRIBUTES_FROM_HEAD     : int = C.GIT_FILTER_ATTRIBUTES_FROM_HEAD
-GIT_FILTER_ATTRIBUTES_FROM_COMMIT   : int = C.GIT_FILTER_ATTRIBUTES_FROM_COMMIT
-
 # libgit version tuple
 LIBGIT2_VER = (LIBGIT2_VER_MAJOR, LIBGIT2_VER_MINOR, LIBGIT2_VER_REVISION)
 

pygit2/_run.py

@@ -81,7 +81,6 @@
     'revert.h',
     'stash.h',
     'submodule.h',
-    'filter.h',
     'callbacks.h', # Bridge from libgit2 to Python
 ]
 h_source = []
@@ -97,7 +96,7 @@
 ffi = FFI()
 ffi.set_source(
     "pygit2._libgit2",
-    "#include <git2.h>\n#include <git2/sys/filter.h>", # preamble
+    "#include <git2.h>", # preamble
     **libgit2_kw
 )
 ffi.cdef(C_HEADER_SRC)

pygit2/decl/callbacks.h

@@ -65,31 +65,3 @@ extern "Python" void _checkout_progress_cb(
 extern "Python" int _stash_apply_progress_cb(
     git_stash_apply_progress_t progress,
     void *payload);
-
-extern "Python" void _filter_shutdown_cb(git_filter *self);
-
-extern "Python" int _filter_check_cb(
-    git_filter *self,
-    void **payload,
-    const git_filter_source *src,
-    const char **attr_values);
-
-extern "Python" int _filter_stream_cb(
-    git_writestream **out,
-    git_filter *self,
-    void **payload,
-    const git_filter_source *src,
-    git_writestream *next);
-
-extern "Python" void _filter_cleanup_cb(
-    git_filter *self,
-    void *payload);
-
-extern "Python" int _writestream_write_cb(
-    git_writestream *stream,
-    const char *buffer,
-    size_t len);
-
-extern "Python" int _writestream_close_cb(git_writestream *stream);
-
-extern "Python" void _writestream_free_cb(git_writestream *stream);

pygit2/decl/filter.h

@@ -12,13 +12,6 @@ typedef struct git_submodule git_submodule;
 typedef struct git_transport git_transport;
 typedef struct git_tree git_tree;
 typedef struct git_packbuilder git_packbuilder;
-typedef struct git_writestream git_writestream;
-
-struct git_writestream {
-	int (*write)(git_writestream *stream, const char *buffer, size_t len);
-	int (*close)(git_writestream *stream);
-	void (*free)(git_writestream *stream);
-};
 
 typedef int64_t git_off_t;
 typedef int64_t git_time_t;