Get rid of the index entry SafeHandle

carlosmn · carlosmn · commit 966ec5a06a32 · 2015-12-16T13:35:08.000+01:00
diff --git a/LibGit2Sharp/Core/GitIndexEntry.cs b/LibGit2Sharp/Core/GitIndexEntry.cs
@@ -13,6 +13,8 @@ internal unsafe struct git_index_mtime
 [StructLayout(LayoutKind.Sequential)]
 internal unsafe struct git_index_entry
{
+ internal const ushort GIT_IDXENTRY_VALID = 0x8000;
+
 public git_index_mtime ctime;
 public git_index_mtime mtime;
 public uint dev;
@@ -26,23 +28,4 @@ internal unsafe struct git_index_entry
 public ushort extended_flags;
 public char* path;
 }
-
- [StructLayout(LayoutKind.Sequential)]
- internal class GitIndexEntry
-{
- internal const ushort GIT_IDXENTRY_VALID = 0x8000;
-
- public GitIndexTime CTime;
- public GitIndexTime MTime;
- public uint Dev;
- public uint Ino;
- public uint Mode;
- public uint Uid;
- public uint Gid;
- public uint file_size;
- public GitOid Id;
- public ushort Flags;
- public ushort ExtendedFlags;
- public IntPtr Path;
- }
 }
diff --git a/LibGit2Sharp/Core/Handles/IndexEntrySafeHandle.cs b/LibGit2Sharp/Core/Handles/IndexEntrySafeHandle.cs
diff --git a/LibGit2Sharp/Core/NativeMethods.cs b/LibGit2Sharp/Core/NativeMethods.cs
@@ -629,9 +629,9 @@ internal static extern int git_index_add_bypath(
 [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictFilePathMarshaler))] FilePath path);
 
 [DllImport(libgit2)]
- internal static extern int git_index_add(
+ internal static extern unsafe int git_index_add(
 IndexSafeHandle index,
- GitIndexEntry entry);
+ git_index_entry* entry);
 
 [DllImport(libgit2)]
 internal static extern unsafe int git_index_conflict_get(
diff --git a/LibGit2Sharp/Core/Proxy.cs b/LibGit2Sharp/Core/Proxy.cs
@@ -893,7 +893,7 @@ public static bool git_ignore_path_is_ignored(RepositorySafeHandle repo, string
 
 #region git_index_
 
- public static void git_index_add(IndexSafeHandle index, GitIndexEntry entry)
+ public static unsafe void git_index_add(IndexSafeHandle index, git_index_entry* entry)
{
 int res = NativeMethods.git_index_add(index, entry);
 Ensure.ZeroResult(res);
diff --git a/LibGit2Sharp/Index.cs b/LibGit2Sharp/Index.cs
@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Globalization;
+using System.Runtime.InteropServices;
 using LibGit2Sharp.Core;
 using LibGit2Sharp.Core.Handles;
 
@@ -270,17 +271,18 @@ public virtual ConflictCollection Conflicts
 get{return conflicts}
 }
 
- private void AddEntryToTheIndex(string path, ObjectId id, Mode mode)
+ private unsafe void AddEntryToTheIndex(string path, ObjectId id, Mode mode)
{
- var indexEntry = new GitIndexEntry
+ IntPtr pathPtr = StrictFilePathMarshaler.FromManaged(path);
+ var indexEntry = new git_index_entry
{
- Mode = (uint)mode,
- Id = id.Oid,
- Path = StrictFilePathMarshaler.FromManaged(path),
+ mode = (uint)mode,
+ path = (char*) pathPtr,
 };
+ Marshal.Copy(id.RawId, 0, new IntPtr(indexEntry.id.Id), GitOid.Size);
 
- Proxy.git_index_add(handle, indexEntry);
- EncodingMarshaler.Cleanup(indexEntry.Path);
+ Proxy.git_index_add(handle, &indexEntry);
+ EncodingMarshaler.Cleanup(pathPtr);
 }
 
 private string DebuggerDisplay
diff --git a/LibGit2Sharp/IndexEntry.cs b/LibGit2Sharp/IndexEntry.cs
@@ -55,7 +55,7 @@ internal static unsafe IndexEntry BuildFromPtr(git_index_entry* entry)
 Id = new ObjectId(entry->id.Id),
 StageLevel = Proxy.git_index_entry_stage(entry),
 Mode = (Mode)entry->mode,
- AssumeUnchanged = (GitIndexEntry.GIT_IDXENTRY_VALID & entry->flags) == GitIndexEntry.GIT_IDXENTRY_VALID
+ AssumeUnchanged = (git_index_entry.GIT_IDXENTRY_VALID & entry->flags) == git_index_entry.GIT_IDXENTRY_VALID
 };
 }
 
diff --git a/LibGit2Sharp/LibGit2Sharp.csproj b/LibGit2Sharp/LibGit2Sharp.csproj
@@ -284,7 +284,6 @@
 <Compile Include="Core\Handles\ObjectDatabaseSafeHandle.cs" />
 <Compile Include="Core\Handles\DiffSafeHandle.cs" />
 <Compile Include="Core\Handles\GitObjectSafeHandle.cs" />
- <Compile Include="Core\Handles\IndexEntrySafeHandle.cs" />
 <Compile Include="Core\Handles\NotOwnedSafeHandleBase.cs" />
 <Compile Include="Core\Handles\OidSafeHandle.cs" />
 <Compile Include="Core\Handles\TreeBuilderSafeHandle.cs" />

-Original file line number
+Diff line change
 [StructLayout(LayoutKind.Sequential)]
 internalunsafestructgit_index_entry
+{
 +internalconstushortGIT_IDXENTRY_VALID=0x8000;
++
 publicgit_index_mtimectime;
 publicgit_index_mtimemtime;
 publicuintdev;
 publicushortextended_flags;
 publicchar*path;
+}
+-
 -[StructLayout(LayoutKind.Sequential)]
 -internalclassGitIndexEntry
 -{
 -internalconstushortGIT_IDXENTRY_VALID=0x8000;
+-
 -publicGitIndexTimeCTime;
 -publicGitIndexTimeMTime;
 -publicuintDev;
 -publicuintIno;
 -publicuintMode;
 -publicuintUid;
 -publicuintGid;
 -publicuintfile_size;
 -publicGitOidId;
 -publicushortFlags;
 -publicushortExtendedFlags;
 -publicIntPtrPath;
 -}
+}
-Original file line number
+Diff line change
 [MarshalAs(UnmanagedType.CustomMarshaler,MarshalCookie=UniqueId.UniqueIdentifier,MarshalTypeRef=typeof(StrictFilePathMarshaler))]FilePathpath);
 [DllImport(libgit2)]
 -internalstaticexternintgit_index_add(
 +internalstaticexternunsafeintgit_index_add(
 IndexSafeHandleindex,
 -GitIndexEntryentry);
 +git_index_entry*entry);
 [DllImport(libgit2)]
 internalstaticexternunsafeintgit_index_conflict_get(
Original file line number	Diff line number	Diff line change
`@@ -893,7 +893,7 @@ public static bool git_ignore_path_is_ignored(RepositorySafeHandle repo, string`
`893`	`893`
`894`	`894`	`#region git_index_`
`895`	`895`
`896`		`-publicstaticvoidgit_index_add(IndexSafeHandleindex,GitIndexEntryentry)`
	`896`	`+publicstaticunsafevoidgit_index_add(IndexSafeHandleindex,git_index_entry*entry)`
`897`	`897`	`{`
`898`	`898`	`intres=NativeMethods.git_index_add(index,entry);`
`899`	`899`	`Ensure.ZeroResult(res);`
-Original file line number
+Diff line change
 usingSystem.Collections.Generic;
 usingSystem.Diagnostics;
 usingSystem.Globalization;
 +usingSystem.Runtime.InteropServices;
 usingLibGit2Sharp.Core;
 usingLibGit2Sharp.Core.Handles;
 get{returnconflicts;}
+}
 -privatevoidAddEntryToTheIndex(stringpath,ObjectIdid,Modemode)
 +privateunsafevoidAddEntryToTheIndex(stringpath,ObjectIdid,Modemode)
+{
 -varindexEntry=newGitIndexEntry
 +IntPtrpathPtr=StrictFilePathMarshaler.FromManaged(path);
 +varindexEntry=newgit_index_entry
+{
 -Mode=(uint)mode,
 -Id=id.Oid,
 -Path=StrictFilePathMarshaler.FromManaged(path),
 +mode=(uint)mode,
 +path=(char*)pathPtr,
 };
 +Marshal.Copy(id.RawId,0,newIntPtr(indexEntry.id.Id),GitOid.Size);
 -Proxy.git_index_add(handle,indexEntry);
 -EncodingMarshaler.Cleanup(indexEntry.Path);
 +Proxy.git_index_add(handle,&indexEntry);
 +EncodingMarshaler.Cleanup(pathPtr);
+}
 privatestringDebuggerDisplay
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ internal static unsafe IndexEntry BuildFromPtr(git_index_entry* entry)`
`55`	`55`	`Id=newObjectId(entry->id.Id),`
`56`	`56`	`StageLevel=Proxy.git_index_entry_stage(entry),`
`57`	`57`	`Mode=(Mode)entry->mode,`
`58`		`-AssumeUnchanged=(GitIndexEntry.GIT_IDXENTRY_VALID&entry->flags)==GitIndexEntry.GIT_IDXENTRY_VALID`
	`58`	`+AssumeUnchanged=(git_index_entry.GIT_IDXENTRY_VALID&entry->flags)==git_index_entry.GIT_IDXENTRY_VALID`
`59`	`59`	`};`
`60`	`60`	`}`
`61`	`61`
-Original file line number
+Diff line change
  <CompileInclude="Core\Handles\ObjectDatabaseSafeHandle.cs" />
  <CompileInclude="Core\Handles\DiffSafeHandle.cs" />
  <CompileInclude="Core\Handles\GitObjectSafeHandle.cs" />
 - <CompileInclude="Core\Handles\IndexEntrySafeHandle.cs" />
  <CompileInclude="Core\Handles\NotOwnedSafeHandleBase.cs" />
  <CompileInclude="Core\Handles\OidSafeHandle.cs" />
  <CompileInclude="Core\Handles\TreeBuilderSafeHandle.cs" />