Merge pull request #946 from libgit2/dahlbyk/register-custom-filters

Custom filter Streams

Author: fat16

Lib/NativeBinaries/amd64/git2-a2012c4.dll

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using LibGit2Sharp.Core;
 using LibGit2Sharp.Tests.TestHelpers;
 using Xunit;
 
@@ -13,7 +12,7 @@ public class FilterFixture : BaseFixture
         private const int GitPassThrough = -30;
 
         readonly Func<FilterSource, IEnumerable<string>, int> checkPassThrough = (source, attr) => GitPassThrough;
-        readonly Func<GitBufReader, GitBufWriter, int> successCallback = (reader, writer) => 0;
+        readonly Func<Stream, Stream, int> successCallback = (reader, writer) => 0;
         readonly Func<FilterSource, IEnumerable<string>, int> checkSuccess = (source, attr) => 0;
 
         private const string FilterName = "the-filter";
@@ -106,7 +105,7 @@ public void ApplyCallbackMadeWhenCheckCallbackReturnsZero()
         {
             bool called = false;
 
-            Func<GitBufReader, GitBufWriter, int> applyCallback = (reader, writer) =>
+            Func<Stream, Stream, int> applyCallback = (reader, writer) =>
             {
                 called = true;
                 return 0; //successCallback
@@ -131,7 +130,7 @@ public void ApplyCallbackNotMadeWhenCheckCallbackReturnsPassThrough()
         {
             bool called = false;
 
-            Func<GitBufReader, GitBufWriter, int> applyCallback = (reader, writer) =>
+            Func<Stream, Stream, int> applyCallback = (reader, writer) =>
             {
                 called = true;
                 return 0;
@@ -271,7 +270,7 @@ public void WhenStagingFileApplyIsCalledWithCleanForCorrectPath()
             string repoPath = InitNewRepository();
             bool called = false;
 
-            Func<GitBufReader, GitBufWriter, int> clean = (reader, writer) =>
+            Func<Stream, Stream, int> clean = (reader, writer) =>
             {
                 called = true;
                 return GitPassThrough;
@@ -297,7 +296,7 @@ public void CleanFilterWritesOutputToObjectTree()
 
             string repoPath = InitNewRepository();
 
-            Func<GitBufReader, GitBufWriter, int> cleanCallback = SubstitutionCipherFilter.RotateByThirteenPlaces;
+            Func<Stream, Stream, int> cleanCallback = SubstitutionCipherFilter.RotateByThirteenPlaces;
 
             var filter = new FakeFilter(FilterName + 16, attributes, checkSuccess, cleanCallback);
 
@@ -327,7 +326,7 @@ public void WhenCheckingOutAFileFileSmudgeWritesCorrectFileToWorkingDirectory()
             const string branchName = "branch";
             string repoPath = InitNewRepository();
 
-            Func<GitBufReader, GitBufWriter, int> smudgeCallback = SubstitutionCipherFilter.RotateByThirteenPlaces;
+            Func<Stream, Stream, int> smudgeCallback = SubstitutionCipherFilter.RotateByThirteenPlaces;
 
             var filter = new FakeFilter(FilterName + 17, attributes, checkSuccess, null, smudgeCallback);
             GlobalSettings.RegisterFilter(filter);
@@ -341,6 +340,54 @@ public void WhenCheckingOutAFileFileSmudgeWritesCorrectFileToWorkingDirectory()
             GlobalSettings.DeregisterFilter(filter.Name);
         }
 
+        [Fact]
+        public void FilterStreamsAreCoherent()
+        {
+            string repoPath = InitNewRepository();
+
+            bool? inputCanWrite = null, inputCanRead = null, inputCanSeek = null;
+            bool? outputCanWrite = null, outputCanRead = null, outputCanSeek = null;
+
+            Func<Stream, Stream, int> assertor = (input, output) =>
+            {
+                inputCanRead = input.CanRead;
+                inputCanWrite = input.CanWrite;
+                inputCanSeek = input.CanSeek;
+
+                outputCanRead = output.CanRead;
+                outputCanWrite = output.CanWrite;
+                outputCanSeek = output.CanSeek;
+
+                return GitPassThrough;
+            };
+
+            var filter = new FakeFilter(FilterName + 18, attributes, checkSuccess, assertor, assertor);
+
+            GlobalSettings.RegisterFilter(filter);
+
+            using (var repo = CreateTestRepository(repoPath))
+            {
+                StageNewFile(repo);
+            }
+
+            GlobalSettings.DeregisterFilter(filter.Name);
+
+            Assert.True(inputCanRead.HasValue);
+            Assert.True(inputCanWrite.HasValue);
+            Assert.True(inputCanSeek.HasValue);
+            Assert.True(outputCanRead.HasValue);
+            Assert.True(outputCanWrite.HasValue);
+            Assert.True(outputCanSeek.HasValue);
+
+            Assert.True(inputCanRead.Value);
+            Assert.False(inputCanWrite.Value);
+            Assert.False(inputCanSeek.Value);
+
+            Assert.False(outputCanRead.Value);
+            Assert.True(outputCanWrite.Value);
+            Assert.False(outputCanSeek.Value);
+        }
+
         private FileInfo CheckoutFileForSmudge(string repoPath, string branchName, string content)
         {
             FileInfo expectedPath;
@@ -394,14 +441,14 @@ public EmptyFilter(string name, IEnumerable<string> attributes)
         class FakeFilter : Filter
         {
             private readonly Func<FilterSource, IEnumerable<string>, int> checkCallBack;
-            private readonly Func<GitBufReader, GitBufWriter, int> cleanCallback;
-            private readonly Func<GitBufReader, GitBufWriter, int> smudgeCallback;
+            private readonly Func<Stream, Stream, int> cleanCallback;
+            private readonly Func<Stream, Stream, int> smudgeCallback;
             private readonly Func<int> initCallback;
 
             public FakeFilter(string name, IEnumerable<string> attributes,
                 Func<FilterSource, IEnumerable<string>, int> checkCallBack = null,
-                Func<GitBufReader, GitBufWriter, int> cleanCallback = null,
-                Func<GitBufReader, GitBufWriter, int> smudgeCallback = null,
+                Func<Stream, Stream, int> cleanCallback = null,
+                Func<Stream, Stream, int> smudgeCallback = null,
                 Func<int> initCallback = null)
                 : base(name, attributes)
             {
@@ -416,12 +463,12 @@ protected override int Check(IEnumerable<string> attributes, FilterSource filter
                 return checkCallBack != null ? checkCallBack(filterSource, attributes) : base.Check(attributes, filterSource);
             }
 
-            protected override int Clean(string path, GitBufReader input, GitBufWriter output)
+            protected override int Clean(string path, Stream input, Stream output)
             {
                 return cleanCallback != null ? cleanCallback(input, output) : base.Clean(path, input, output);
             }
 
-            protected override int Smudge(string path, GitBufReader input, GitBufWriter output)
+            protected override int Smudge(string path, Stream input, Stream output)
             {
                 return smudgeCallback != null ? smudgeCallback(input, output) : base.Smudge(path, input, output);
             }

Lib/NativeBinaries/amd64/git2-e0902fb.pdb renamed to Lib/NativeBinaries/amd64/git2-a2012c4.pdb

@@ -96,4 +96,4 @@ private static Blob CommitOnBranchAndReturnDatabaseBlob(Repository repo, string
             return blob;
         }
     }
-}
+}

Lib/NativeBinaries/amd64/git2-e0902fb.dll

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
+using System.IO;
 using System.Text;
-using LibGit2Sharp.Core;
 
 namespace LibGit2Sharp.Tests.TestHelpers
 {
@@ -21,34 +21,41 @@ protected override int Check(IEnumerable<string> attributes, FilterSource filter
             return base.Check(attributes, filterSource);
         }
 
-        protected override int Clean(string path, GitBufReader input, GitBufWriter output)
+        protected override int Clean(string path, Stream input, Stream output)
         {
             CleanCalledCount++;
             return RotateByThirteenPlaces(input, output);
         }
 
-        protected override int Smudge(string path, GitBufReader input, GitBufWriter output)
+        protected override int Smudge(string path, Stream input, Stream output)
         {
             SmudgeCalledCount++;
             return RotateByThirteenPlaces(input, output);
         }
 
-        public static int RotateByThirteenPlaces(GitBufReader input, GitBufWriter output)
+        public static int RotateByThirteenPlaces(Stream input, Stream output)
         {
-            var inputString = Encoding.UTF8.GetString(input.ReadAll());
-            char[] array = inputString.ToCharArray();
-            char value;
-            for (int i = 0; i < inputString.Length; i++)
+
+            using (var streamReader = new StreamReader(input, Encoding.UTF8))
             {
-                value = inputString[i];
-                if ((value >= 'a' && value <= 'm') || (value >= 'A' && value <= 'M'))
-                    array[i] = (char)(value + 13);
-                else if ((value >= 'n' && value <= 'z') || (value >= 'N' && value <= 'Z'))
-                    array[i] = (char)(value - 13);
+                var inputString = streamReader.ReadToEnd();
+                char[] array = inputString.ToCharArray();
+                for (int i = 0; i < inputString.Length; i++)
+                {
+                    var value = inputString[i];
+                    if ((value >= 'a' && value <= 'm') || (value >= 'A' && value <= 'M'))
+                        array[i] = (char)(value + 13);
+                    else if ((value >= 'n' && value <= 'z') || (value >= 'N' && value <= 'Z'))
+                        array[i] = (char)(value - 13);
+                }
+
+                using (var streamWriter = new StreamWriter(output, Encoding.UTF8))
+                {
+                    streamWriter.Write(array);
+                }
+
+                return 0;
             }
-            var outputString = new string(array);
-            output.Write(Encoding.UTF8.GetBytes(outputString));
-            return 0;
         }
     }
-}
+}

Lib/NativeBinaries/x86/git2-a2012c4.dll

@@ -0,0 +1,48 @@
+using System;
+using System.Globalization;
+using System.IO;
+using LibGit2Sharp.Core.Handles;
+
+namespace LibGit2Sharp.Core
+{
+    /// <summary>
+    /// Reads data from a <see cref="GitBuf"/> pointer
+    /// </summary>
+    internal class GitBufReadStream : UnmanagedMemoryStream
+    {
+        internal GitBufReadStream(IntPtr gitBufPointer)
+            : this(gitBufPointer.MarshalAs<GitBuf>())
+        { }
+
+        private unsafe GitBufReadStream(GitBuf gitBuf)
+            : base((byte*)gitBuf.ptr,
+                   ConvertToLong(gitBuf.size),
+                   ConvertToLong(gitBuf.asize),
+                   FileAccess.Read)
+        { }
+
+        private static long ConvertToLong(UIntPtr len)
+        {
+            if (len.ToUInt64() > long.MaxValue)
+            {
+                throw new InvalidOperationException(
+                    string.Format(
+                        CultureInfo.InvariantCulture,
+                        "Provided length ({0}) exceeds long.MaxValue ({1}).",
+                        len.ToUInt64(), long.MaxValue));
+            }
+
+            return (long)len.ToUInt64();
+        }
+
+        public override long Seek(long offset, SeekOrigin loc)
+        {
+            throw new NotSupportedException();
+        }
+
+        public override bool CanSeek
+        {
+            get { return false; }
+        }
+    }
+}