Make ContentChanges.IsBinaryDelta() an extension method

dahlbyk · dahlbyk · commit cffdf24ef34f · 2012-06-09T00:01:33.000-05:00
diff --git a/LibGit2Sharp/ContentChanges.cs b/LibGit2Sharp/ContentChanges.cs
@@ -26,7 +26,7 @@ internal ContentChanges(Repository repo, Blob oldBlob, Blob newBlob, GitDiffOpti
 
         private int FileCallback(IntPtr data, GitDiffDelta delta, float progress)
         {
-            IsBinaryComparison = IsBinaryDelta(delta);
+            IsBinaryComparison = delta.IsBinary();
 
             if (!IsBinaryComparison)
             {
@@ -38,12 +38,6 @@ private int FileCallback(IntPtr data, GitDiffDelta delta, float progress)
             return 0;
         }
 
-        internal static bool IsBinaryDelta(GitDiffDelta delta)
-        {
-            //TODO Fix the interop issue on amd64 and use GitDiffDelta.Binary
-            return delta.OldFile.Flags.Has(GitDiffFileFlags.GIT_DIFF_FILE_BINARY) || delta.NewFile.Flags.Has(GitDiffFileFlags.GIT_DIFF_FILE_BINARY);
-        }
-
         private int HunkCallback(IntPtr data, GitDiffDelta delta, GitDiffRange range, IntPtr header, uint headerlen)
         {
             string decodedContent = Utf8Marshaler.FromNative(header, headerlen);
diff --git a/LibGit2Sharp/Core/GitDiffExtensions.cs b/LibGit2Sharp/Core/GitDiffExtensions.cs
@@ -0,0 +1,11 @@
+namespace LibGit2Sharp.Core
+{
+    internal static class GitDiffExtensions
+    {
+        public static bool IsBinary(this GitDiffDelta delta)
+        {
+            //TODO Fix the interop issue on amd64 and use GitDiffDelta.Binary
+            return delta.OldFile.Flags.Has(GitDiffFileFlags.GIT_DIFF_FILE_BINARY) || delta.NewFile.Flags.Has(GitDiffFileFlags.GIT_DIFF_FILE_BINARY);
+        }
+    }
+}
diff --git a/LibGit2Sharp/LibGit2Sharp.csproj b/LibGit2Sharp/LibGit2Sharp.csproj
@@ -74,6 +74,7 @@
     <Compile Include="ChangeKind.cs" />
     <Compile Include="Core\GitBranchType.cs" />
     <Compile Include="Core\GitDiff.cs" />
+    <Compile Include="Core\GitDiffExtensions.cs" />
     <Compile Include="Core\GitError.cs" />
     <Compile Include="Core\GitErrorType.cs" />
     <Compile Include="Core\GitNoteData.cs" />
diff --git a/LibGit2Sharp/TreeChanges.cs b/LibGit2Sharp/TreeChanges.cs
@@ -92,7 +92,7 @@ private void AddFileChange(GitDiffDelta delta)
             var newOid = new ObjectId(delta.NewFile.Oid);
             var oldOid = new ObjectId(delta.OldFile.Oid);
 
-            var diffFile = new TreeEntryChanges(newFilePath, newMode, newOid, delta.Status, oldFilePath, oldMode, oldOid, ContentChanges.IsBinaryDelta(delta));
+            var diffFile = new TreeEntryChanges(newFilePath, newMode, newOid, delta.Status, oldFilePath, oldMode, oldOid, delta.IsBinary());
 
             fileDispatcher[delta.Status](this, diffFile);
             changes.Add(diffFile.Path, diffFile);

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ internal ContentChanges(Repository repo, Blob oldBlob, Blob newBlob, GitDiffOpti`
`26`	`26`
`27`	`27`	`private int FileCallback(IntPtr data, GitDiffDelta delta, float progress)`
`28`	`28`	`{`
`29`		`- IsBinaryComparison = IsBinaryDelta(delta);`
	`29`	`+ IsBinaryComparison = delta.IsBinary();`
`30`	`30`
`31`	`31`	`if (!IsBinaryComparison)`
`32`	`32`	`{`
`@@ -38,12 +38,6 @@ private int FileCallback(IntPtr data, GitDiffDelta delta, float progress)`
`38`	`38`	`return 0;`
`39`	`39`	`}`
`40`	`40`
`41`		`- internal static bool IsBinaryDelta(GitDiffDelta delta)`
`42`		`- {`
`43`		`- //TODO Fix the interop issue on amd64 and use GitDiffDelta.Binary`
`44`		`- return delta.OldFile.Flags.Has(GitDiffFileFlags.GIT_DIFF_FILE_BINARY) \|\| delta.NewFile.Flags.Has(GitDiffFileFlags.GIT_DIFF_FILE_BINARY);`
`45`		`- }`
`46`		`-`
`47`	`41`	`private int HunkCallback(IntPtr data, GitDiffDelta delta, GitDiffRange range, IntPtr header, uint headerlen)`
`48`	`42`	`{`
`49`	`43`	`string decodedContent = Utf8Marshaler.FromNative(header, headerlen);`