Clean up custom callbacks

Author: ammeep

LibGit2Sharp.Tests/FilterFixture.cs

@@ -203,6 +203,31 @@ public override void Dispose()
             base.Dispose();
         }
 
+        [Fact]
+        public void CleanUpIsCalledAfterStage()
+        {
+            bool called = false;
+
+            Action cleanUpCallback = () =>
+            {
+                called = true;
+            };
+
+            string repoPath = InitNewRepository();
+            var callbacks = new FilterCallbacks(() => 0, ()=> 0, () => {}, ()=>0, cleanUpCallback);
+            var test = new Filter("test-filter55", "filter", 1, callbacks);
+            using (var repo = new Repository(repoPath))
+            {
+                test.Register();
+
+                StageNewFile(repo, 44);
+            }
+
+            test.Deregister();
+            Assert.True(called);
+        }
+
+
         [Fact]
         public void ShutdownCallbackNotMadeWhenFilterNeverUsed()
         {

LibGit2Sharp/Core/GitFilter.cs

@@ -13,16 +13,6 @@ internal class GitFilter
 
         public IntPtr attributes;
 
-        //public IntPtr init;
-
-        //public IntPtr shutdown;
-
-        //public IntPtr check;
-
-        //public IntPtr apply;
-
-        //public IntPtr cleanup;
-
         [MarshalAs(UnmanagedType.FunctionPtr)]
         public git_filter_init_fn init;
 

LibGit2Sharp/Filter.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Runtime.InteropServices;
 using System.Text;
 using LibGit2Sharp.Core;
 using LibGit2Sharp.Core.Handles;
@@ -190,6 +189,7 @@ private int ApplyCallback(IntPtr gitFilter, IntPtr payload, IntPtr gitBufferTo,
         private void CleanUpCallback(IntPtr gitFilter, IntPtr payload)
         {
             Console.WriteLine("Cleanup");
+            filterCallbacks.CustomCleanUpCallback();
         }
 
         /// <summary>
@@ -270,6 +270,7 @@ public class FilterCallbacks
         private readonly Func<int> customApplyCallback;
         private readonly Func<int> customInitializeCallback;
         private readonly Action customShutdownCallback;
+        private Action customCleanUpCallback;
 
         private readonly Func<int> passThroughFunc = () => (int) GitErrorCode.PassThrough;
         private readonly Func<int> passThroughSuccess = () => 0;
@@ -285,12 +286,14 @@ public FilterCallbacks(
             Func<int> customCheckCallback = null,
             Func<int> customApplyCallback = null, 
             Action customShutdownCallback = null,
-            Func<int> customInitializeCallback = null)
+            Func<int> customInitializeCallback = null,
+            Action customCleanupCallback = null)
         {
             this.customCheckCallback = customCheckCallback ?? passThroughFunc;
             this.customApplyCallback = customApplyCallback ?? passThroughFunc;
             this.customShutdownCallback = customShutdownCallback ??  (() => { });
             this.customInitializeCallback = customInitializeCallback ?? passThroughSuccess;
+            this.customCleanUpCallback = customCleanupCallback ?? (() => { });
         }
 
         /// <summary>
@@ -349,6 +352,18 @@ public Action CustomShutdownCallback
                 return customShutdownCallback;
             }
         }
+        /// <summary>
+        /// Callback to clean up after filtering has been applied. Specified as `filter.cleanup`, this is an optional callback invoked
+        /// after the filter has been applied.  If the `check` or `apply` callbacks allocated a `payload` 
+        /// to keep per-source filter state, use this  callback to free that payload and release resources as required.
+        /// </summary>
+        public Action CustomCleanUpCallback
+        {
+            get
+            {
+                return customCleanUpCallback;
+            }
+        }
 
         /// <summary>
         /// Initialize callback on filter