Use pointers for tree entries

We wrap the owned handle in a IDisposable to keep the using() pattern.

Author: carlosmn

LibGit2Sharp/Core/Handles/TreeEntryOwnedHandle.cs

@@ -0,0 +1,19 @@
+usingSystem;
+
+namespaceLibGit2Sharp.Core.Handles
+{
+internalunsafeclassTreeEntryOwnedHandle:IDisposable
+{
+internalgit_tree_entry*Handle{get;set;}
+
+internalTreeEntryOwnedHandle(git_tree_entry*entry)
+{
+Handle=entry;
+}
+
+publicvoidDispose()
+{
+Proxy.git_tree_entry_free(Handle);
+}
+}
+}

LibGit2Sharp/Core/Handles/TreeEntrySafeHandle_Owned.cs

@@ -1737,29 +1737,29 @@ internal static extern int git_transport_unregister(
 [MarshalAs(UnmanagedType.CustomMarshaler,MarshalCookie=UniqueId.UniqueIdentifier,MarshalTypeRef=typeof(StrictUtf8Marshaler))]stringprefix);
 
 [DllImport(libgit2)]
-internalstaticexternuintgit_tree_entry_filemode(SafeHandleentry);
+internalstaticexternunsafeuintgit_tree_entry_filemode(git_tree_entry*entry);
 
 [DllImport(libgit2)]
-internalstaticexternTreeEntrySafeHandlegit_tree_entry_byindex(GitObjectSafeHandletree,UIntPtridx);
+internalstaticexternunsafegit_tree_entry*git_tree_entry_byindex(GitObjectSafeHandletree,UIntPtridx);
 
 [DllImport(libgit2)]
-internalstaticexternintgit_tree_entry_bypath(
-outTreeEntrySafeHandle_Ownedtree,
+internalstaticexternunsafeintgit_tree_entry_bypath(
+outgit_tree_entry*tree,
 GitObjectSafeHandleroot,
 [MarshalAs(UnmanagedType.CustomMarshaler,MarshalCookie=UniqueId.UniqueIdentifier,MarshalTypeRef=typeof(StrictFilePathMarshaler))]FilePathtreeentry_path);
 
 [DllImport(libgit2)]
-internalstaticexternvoidgit_tree_entry_free(IntPtrtreeEntry);
+internalstaticexternunsafevoidgit_tree_entry_free(git_tree_entry*treeEntry);
 
 [DllImport(libgit2)]
-internalstaticexternOidSafeHandlegit_tree_entry_id(SafeHandleentry);
+internalstaticexternunsafeOidSafeHandlegit_tree_entry_id(git_tree_entry*entry);
 
 [DllImport(libgit2)]
 [return:MarshalAs(UnmanagedType.CustomMarshaler,MarshalCookie=UniqueId.UniqueIdentifier,MarshalTypeRef=typeof(LaxUtf8NoCleanupMarshaler))]
-internalstaticexternstringgit_tree_entry_name(SafeHandleentry);
+internalstaticexternunsafestringgit_tree_entry_name(git_tree_entry*entry);
 
 [DllImport(libgit2)]
-internalstaticexternGitObjectTypegit_tree_entry_type(SafeHandleentry);
+internalstaticexternunsafeGitObjectTypegit_tree_entry_type(git_tree_entry*entry);
 
 [DllImport(libgit2)]
 internalstaticexternUIntPtrgit_tree_entrycount(GitObjectSafeHandletree);

LibGit2Sharp/Core/NativeMethods.cs

@@ -0,0 +1,7 @@
+usingSystem;
+
+namespaceLibGit2Sharp.Core
+{
+internalstructgit_tree_entry{}
+}
+

LibGit2Sharp/Core/Opaques.cs

@@ -3156,21 +3156,21 @@ public static void git_transport_unregister(String prefix)
 
  #region git_tree_
 
-publicstaticModegit_tree_entry_attributes(SafeHandleentry)
+publicstaticunsafeModegit_tree_entry_attributes(git_tree_entry*entry)
 {
 return(Mode)NativeMethods.git_tree_entry_filemode(entry);
 }
 
-publicstaticTreeEntrySafeHandlegit_tree_entry_byindex(GitObjectSafeHandletree,longidx)
+publicstaticunsafegit_tree_entry*git_tree_entry_byindex(GitObjectSafeHandletree,longidx)
 {
 returnNativeMethods.git_tree_entry_byindex(tree,(UIntPtr)idx);
 }
 
-publicstaticTreeEntrySafeHandle_Ownedgit_tree_entry_bypath(RepositorySafeHandlerepo,ObjectIdid,FilePathtreeentry_path)
+publicstaticunsafeTreeEntryOwnedHandlegit_tree_entry_bypath(RepositorySafeHandlerepo,ObjectIdid,FilePathtreeentry_path)
 {
 using(varobj=newObjectSafeWrapper(id,repo))
 {
-TreeEntrySafeHandle_OwnedtreeEntryPtr;
+git_tree_entry*treeEntryPtr;
 intres=NativeMethods.git_tree_entry_bypath(outtreeEntryPtr,obj.ObjectPtr,treeentry_path);
 
 if(res==(int)GitErrorCode.NotFound)
@@ -3180,26 +3180,26 @@ public static TreeEntrySafeHandle_Owned git_tree_entry_bypath(RepositorySafeHand
 
 Ensure.ZeroResult(res);
 
-returntreeEntryPtr;
+returnnewTreeEntryOwnedHandle(treeEntryPtr);
 }
 }
 
-publicstaticvoidgit_tree_entry_free(IntPtrtreeEntry)
+publicstaticunsafevoidgit_tree_entry_free(git_tree_entry*treeEntry)
 {
 NativeMethods.git_tree_entry_free(treeEntry);
 }
 
-publicstaticObjectIdgit_tree_entry_id(SafeHandleentry)
+publicstaticunsafeObjectIdgit_tree_entry_id(git_tree_entry*entry)
 {
 returnNativeMethods.git_tree_entry_id(entry).MarshalAsObjectId();
 }
 
-publicstaticstringgit_tree_entry_name(SafeHandleentry)
+publicstaticunsafestringgit_tree_entry_name(git_tree_entry*entry)
 {
 returnNativeMethods.git_tree_entry_name(entry);
 }
 
-publicstaticGitObjectTypegit_tree_entry_type(SafeHandleentry)
+publicstaticunsafeGitObjectTypegit_tree_entry_type(git_tree_entry*entry)
 {
 returnNativeMethods.git_tree_entry_type(entry);
 }

LibGit2Sharp/Core/Proxy.cs

@@ -287,7 +287,6 @@
  <CompileInclude="Core\Handles\NotOwnedSafeHandleBase.cs" />
  <CompileInclude="Core\Handles\OidSafeHandle.cs" />
  <CompileInclude="Core\Handles\TreeBuilderSafeHandle.cs" />
- <CompileInclude="Core\Handles\TreeEntrySafeHandle_Owned.cs" />
  <CompileInclude="Core\Handles\ReferenceSafeHandle.cs" />
  <CompileInclude="Core\Handles\SignatureSafeHandle.cs" />
  <CompileInclude="Core\Handles\TreeEntrySafeHandle.cs" />
@@ -381,6 +380,8 @@
  <CompileInclude="Core\GitCertificateSshType.cs" />
  <CompileInclude="CertificateSsh.cs" />
  <CompileInclude="IDiffResult.cs" />
+ <CompileInclude="Core\Opaques.cs" />
+ <CompileInclude="Core\Handles\TreeEntryOwnedHandle.cs" />
  </ItemGroup>
  <ItemGroup>
  <CodeAnalysisDictionaryInclude="CustomDictionary.xml" />

LibGit2Sharp/LibGit2Sharp.csproj

@@ -47,24 +47,24 @@ public virtual TreeEntry this[string relativePath]
 get{returnRetrieveFromPath(relativePath);}
 }
 
-privateTreeEntryRetrieveFromPath(FilePathrelativePath)
+privateunsafeTreeEntryRetrieveFromPath(FilePathrelativePath)
 {
 if(relativePath.IsNullOrEmpty())
 {
 returnnull;
 }
 
-using(TreeEntrySafeHandle_OwnedtreeEntryPtr=Proxy.git_tree_entry_bypath(repo.Handle,Id,relativePath))
+using(TreeEntryOwnedHandletreeEntry=Proxy.git_tree_entry_bypath(repo.Handle,Id,relativePath))
 {
-if(treeEntryPtr==null)
+if(treeEntry==null)
 {
 returnnull;
 }
 
 stringposixPath=relativePath.Posix;
 stringfilename=posixPath.Split('/').Last();
 stringparentPath=posixPath.Substring(0,posixPath.Length-filename.Length);
-returnnewTreeEntry(treeEntryPtr,Id,repo,path.Combine(parentPath));
+returnnewTreeEntry(treeEntry.Handle,Id,repo,path.Combine(parentPath));
 }
 }
 
@@ -75,6 +75,11 @@ internal string Path
 
  #region IEnumerable<TreeEntry> Members
 
+unsafeTreeEntrybyIndex(ObjectSafeWrapperobj,uinti,ObjectIdparentTreeId,Repositoryrepo,FilePathparentPath)
+{
+returnnewTreeEntry(Proxy.git_tree_entry_byindex(obj.ObjectPtr,i),parentTreeId,repo,parentPath);
+}
+
 /// <summary>
 /// Returns an enumerator that iterates through the collection.
 /// </summary>
@@ -83,10 +88,8 @@ public virtual IEnumerator<TreeEntry> GetEnumerator()
 {
 using(varobj=newObjectSafeWrapper(Id,repo.Handle))
 {
-for(uinti=0;i<Count;i++)
-{
-TreeEntrySafeHandlehandle=Proxy.git_tree_entry_byindex(obj.ObjectPtr,i);
-yieldreturnnewTreeEntry(handle,Id,repo,path);
+for(uinti=0;i<Count;i++){
+yieldreturnbyIndex(obj,i,Id,repo,path);
 }
 }
 }

LibGit2Sharp/Tree.cs

@@ -27,19 +27,19 @@ public class TreeEntry : IEquatable<TreeEntry>
 protectedTreeEntry()
 {}
 
-internalTreeEntry(SafeHandleobj,ObjectIdparentTreeId,Repositoryrepo,FilePathparentPath)
+internalunsafeTreeEntry(git_tree_entry*entry,ObjectIdparentTreeId,Repositoryrepo,FilePathparentPath)
 {
 this.parentTreeId=parentTreeId;
 this.repo=repo;
-targetOid=Proxy.git_tree_entry_id(obj);
+targetOid=Proxy.git_tree_entry_id(entry);
 
-GitObjectTypetreeEntryTargetType=Proxy.git_tree_entry_type(obj);
+GitObjectTypetreeEntryTargetType=Proxy.git_tree_entry_type(entry);
 TargetType=treeEntryTargetType.ToTreeEntryTargetType();
 
 target=newLazy<GitObject>(RetrieveTreeEntryTarget);
 
-Mode=Proxy.git_tree_entry_attributes(obj);
-Name=Proxy.git_tree_entry_name(obj);
+Mode=Proxy.git_tree_entry_attributes(entry);
+Name=Proxy.git_tree_entry_name(entry);
 path=newLazy<string>(()=>System.IO.Path.Combine(parentPath.Native,Name));
 }