Merge pull request #919 from libgit2/ethomson/libgit2_update

Update libgit2 to d5712ed

Author: ethomson

Lib/NativeBinaries/amd64/git2-d5712ed.dll

@@ -2,6 +2,6 @@ namespace LibGit2Sharp.Core
 {
 	internal static class NativeDllName
 	{
-		public const string Name = "git2-dce7b1a";
+		public const string Name = "git2-d5712ed";
 	}
 }

Lib/NativeBinaries/amd64/git2-dce7b1a.pdb Lib/NativeBinaries/amd64/git2-d5712ed.pdbLib/NativeBinaries/amd64/git2-dce7b1a.pdb renamed to Lib/NativeBinaries/amd64/git2-d5712ed.pdb

@@ -811,52 +811,10 @@ internal static extern int git_patch_line_stats(
         [DllImport(libgit2)]
         internal static extern void git_patch_free(IntPtr patch);
 
-        [DllImport(libgit2)]
-        internal static extern int git_push_new(out PushSafeHandle push, RemoteSafeHandle remote);
-
         /* Push network progress notification function */
         internal delegate int git_push_transfer_progress(uint current, uint total, UIntPtr bytes, IntPtr payload);
         internal delegate int git_packbuilder_progress(int stage, uint current, uint total, IntPtr payload);
 
-        [DllImport(libgit2)]
-        internal static extern int git_push_set_callbacks(
-            PushSafeHandle push,
-            git_packbuilder_progress pack_progress_cb,
-            IntPtr pack_progress_cb_payload,
-            git_push_transfer_progress transfer_progress_cb,
-            IntPtr transfer_progress_cb_payload);
-
-        [DllImport(libgit2)]
-        internal static extern int git_push_set_options(PushSafeHandle push, GitPushOptions options);
-
-        [DllImport(libgit2)]
-        internal static extern int git_push_add_refspec(
-            PushSafeHandle push,
-            [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string pushRefSpec);
-
-        [DllImport(libgit2)]
-        internal static extern int git_push_finish(PushSafeHandle push);
-
-        [DllImport(libgit2)]
-        internal static extern void git_push_free(IntPtr push);
-
-        [DllImport(libgit2)]
-        internal static extern int git_push_status_foreach(
-            PushSafeHandle push,
-            push_status_foreach_cb status_cb,
-            IntPtr data);
-
-        internal delegate int push_status_foreach_cb(
-            IntPtr reference,
-            IntPtr msg,
-            IntPtr data);
-
-        [DllImport(libgit2)]
-        internal static extern int git_push_update_tips(
-            PushSafeHandle push,
-            SignatureSafeHandle signature,
-            [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string log_message);
-
         [DllImport(libgit2)]
         internal static extern int git_reference_create(
             out ReferenceSafeHandle reference,
@@ -1071,6 +1029,14 @@ internal static extern int git_remote_fetch(
         [DllImport(libgit2)]
         internal static extern int git_remote_get_push_refspecs(out GitStrArray array, RemoteSafeHandle remote);
 
+        [DllImport(libgit2)]
+        internal static extern int git_remote_push(
+            RemoteSafeHandle remote,
+            ref GitStrArray refSpecs,
+            GitPushOptions opts,
+            SignatureSafeHandle signature,
+            [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string reflogMessage);
+
         [DllImport(libgit2)]
         internal static extern UIntPtr git_remote_refspec_count(RemoteSafeHandle remote);
 
@@ -1555,7 +1521,7 @@ internal static extern int git_tree_entry_bypath(
         internal static extern UIntPtr git_tree_entrycount(GitObjectSafeHandle tree);
 
         [DllImport(libgit2)]
-        internal static extern int git_treebuilder_create(out TreeBuilderSafeHandle builder, RepositorySafeHandle repo, IntPtr src);
+        internal static extern int git_treebuilder_new(out TreeBuilderSafeHandle builder, RepositorySafeHandle repo, IntPtr src);
 
         [DllImport(libgit2)]
         internal static extern int git_treebuilder_insert(

Lib/NativeBinaries/amd64/git2-dce7b1a.dll

@@ -1498,84 +1498,6 @@ public static Tuple<int, int> git_patch_line_stats(PatchSafeHandle patch)
 
         #endregion
 
-        #region git_push_
-
-        public static void git_push_add_refspec(PushSafeHandle push, string pushRefSpec)
-        {
-            using (ThreadAffinity())
-            {
-                int res = NativeMethods.git_push_add_refspec(push, pushRefSpec);
-                Ensure.ZeroResult(res);
-            }
-        }
-
-        public static void git_push_finish(PushSafeHandle push)
-        {
-            using (ThreadAffinity())
-            {
-                int res = NativeMethods.git_push_finish(push);
-                Ensure.ZeroResult(res);
-            }
-        }
-
-        public static void git_push_free(IntPtr push)
-        {
-            NativeMethods.git_push_free(push);
-        }
-
-        public static PushSafeHandle git_push_new(RemoteSafeHandle remote)
-        {
-            using (ThreadAffinity())
-            {
-                PushSafeHandle handle;
-                int res = NativeMethods.git_push_new(out handle, remote);
-                Ensure.ZeroResult(res);
-                return handle;
-            }
-        }
-
-        public static void git_push_set_callbacks(
-            PushSafeHandle push,
-            NativeMethods.git_push_transfer_progress pushTransferProgress,
-            NativeMethods.git_packbuilder_progress packBuilderProgress)
-        {
-            using (ThreadAffinity())
-            {
-                int res = NativeMethods.git_push_set_callbacks(push, packBuilderProgress, IntPtr.Zero, pushTransferProgress, IntPtr.Zero);
-                Ensure.ZeroResult(res);
-            }
-        }
-
-        public static void git_push_set_options(PushSafeHandle push, GitPushOptions options)
-        {
-            using (ThreadAffinity())
-            {
-                int res = NativeMethods.git_push_set_options(push, options);
-                Ensure.ZeroResult(res);
-            }
-        }
-
-        public static void git_push_status_foreach(PushSafeHandle push, NativeMethods.push_status_foreach_cb status_cb)
-        {
-            using (ThreadAffinity())
-            {
-                int res = NativeMethods.git_push_status_foreach(push, status_cb, IntPtr.Zero);
-                Ensure.ZeroResult(res);
-            }
-        }
-
-        public static void git_push_update_tips(PushSafeHandle push, Signature signature, string logMessage)
-        {
-            using (ThreadAffinity())
-            using (var sigHandle = signature.BuildHandle())
-            {
-                int res = NativeMethods.git_push_update_tips(push, sigHandle, logMessage);
-                Ensure.ZeroResult(res);
-            }
-        }
-
-        #endregion
-
         #region git_reference_
 
         public static ReferenceSafeHandle git_reference_create(RepositorySafeHandle repo, string name, ObjectId targetId, bool allowOverwrite,
@@ -1969,6 +1891,29 @@ public static IList<string> git_remote_get_push_refspecs(RemoteSafeHandle remote
             }
         }
 
+        public static void git_remote_push(RemoteSafeHandle remote, IEnumerable<string> refSpecs, GitPushOptions opts, Signature signature, string reflogMessage)
+        {
+            using (ThreadAffinity())
+            {
+                using (var sigHandle = signature.BuildHandle())
+                {
+                    var array = new GitStrArrayManaged();
+
+                    try
+                    {
+                        array = GitStrArrayManaged.BuildFrom(refSpecs.ToArray());
+
+                        int res = NativeMethods.git_remote_push(remote, ref array.Array, opts, sigHandle, reflogMessage);
+                        Ensure.ZeroResult(res);
+                    }
+                    finally
+                    {
+                        array.Dispose();
+                    }
+                }
+            }
+        }
+
         public static void git_remote_set_fetch_refspecs(RemoteSafeHandle remote, IEnumerable<string> refSpecs)
         {
             using (ThreadAffinity())
@@ -3076,12 +3021,12 @@ public static int git_tree_entrycount(GitObjectSafeHandle tree)
 
         #region git_treebuilder_
 
-        public static TreeBuilderSafeHandle git_treebuilder_create(RepositorySafeHandle repo)
+        public static TreeBuilderSafeHandle git_treebuilder_new(RepositorySafeHandle repo)
         {
             using (ThreadAffinity())
             {
                 TreeBuilderSafeHandle builder;
-                int res = NativeMethods.git_treebuilder_create(out builder, repo, IntPtr.Zero);
+                int res = NativeMethods.git_treebuilder_new(out builder, repo, IntPtr.Zero);
                 Ensure.ZeroResult(res);
 
                 return builder;