Upgrade libgit2 binaries to a0ce87c51

Author: ben

Lib/NativeBinaries/amd64/git2.dll

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
+using System.Runtime.InteropServices;
 using LibGit2Sharp.Core;
 using LibGit2Sharp.Core.Handles;
 
@@ -409,11 +410,15 @@ private static Action<string, object, ConfigurationSafeHandle> GetUpdater<T>(Act
 
         IEnumerator<ConfigurationEntry> IEnumerable<ConfigurationEntry>.GetEnumerator()
         {
-            return Proxy.git_config_foreach(LocalHandle, (namePtr, valuePtr) => {
-                var name = Utf8Marshaler.FromNative(namePtr);
-                var value = Utf8Marshaler.FromNative(valuePtr);
-                return new ConfigurationEntry(name, value);
-            }).GetEnumerator();
+            return Proxy.git_config_foreach(LocalHandle, 
+                (entryPtr) =>
+                    {
+                        var entry = (GitConfigEntry)Marshal.PtrToStructure(entryPtr, typeof(GitConfigEntry));
+                        return new ConfigurationEntry(Utf8Marshaler.FromNative(entry.namePtr),
+                                                      Utf8Marshaler.FromNative(entry.valuePtr),
+                                                      (ConfigurationLevel) entry.level);
+                    })
+                .GetEnumerator();
         }
 
         System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()

Lib/NativeBinaries/amd64/git2.pdb

@@ -15,15 +15,23 @@ public class ConfigurationEntry
         /// </summary>
         public string Value { get; private set; }
 
+
+        /// <summary>
+        /// The origin store.
+        /// </summary>
+        public ConfigurationLevel Level { get; private set; }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ConfigurationEntry"/> class with a given key and value
         /// </summary>
         /// <param name="key">The option name</param>
         /// <param name="value">The option value, as a string</param>
-        public ConfigurationEntry(string key, string value)
+        /// <param name="level">The origin store</param>
+        public ConfigurationEntry(string key, string value, ConfigurationLevel level)
         {
             Key = key;
             Value = value;
+            Level = level;
         }
     }
 }

Lib/NativeBinaries/x86/git2.dll

@@ -8,16 +8,21 @@ public enum ConfigurationLevel
         /// <summary>
         ///   The local .git/config of the current repository.
         /// </summary>
-        Local,
+        Local = 4,
 
         /// <summary>
         ///   The global ~/.gitconfig of the current user.
         /// </summary>
-        Global,
+        Global = 3,
+
+        /// <summary>
+        /// The global ~/.config/git/config of the current user
+        /// </summary>
+        XDG = 2,
 
         /// <summary>
         ///   The system wide .gitconfig.
         /// </summary>
-        System
+        System = 1,
     }
 }

Lib/NativeBinaries/x86/git2.pdb

@@ -0,0 +1,14 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace LibGit2Sharp.Core
+{
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct GitConfigEntry
+    {
+        public IntPtr namePtr;
+        public IntPtr valuePtr;
+        public uint level;
+    }
+}
+

LibGit2Sharp/Configuration.cs

@@ -226,7 +226,8 @@ internal static extern int git_config_get_string(
         internal static extern int git_config_add_file_ondisk(
             ConfigurationSafeHandle cfg,
             [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(FilePathMarshaler))] FilePath path,
-            int priority);
+            uint level,
+            bool force);
 
         [DllImport(libgit2)]
         internal static extern int git_config_new(out ConfigurationSafeHandle cfg);
@@ -261,8 +262,7 @@ internal static extern int git_config_set_string(
             [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(Utf8Marshaler))] string value);
 
         internal delegate int config_foreach_callback(
-            IntPtr var_name,
-            IntPtr value,
+            IntPtr entry,
             IntPtr payload);
 
         [DllImport(libgit2)]
@@ -591,13 +591,18 @@ internal static extern int git_remote_new(
         internal static extern void git_remote_disconnect(RemoteSafeHandle remote);
 
         [DllImport(libgit2)]
-        internal static extern int git_remote_download(RemoteSafeHandle remote, ref long bytes, ref GitIndexerStats stats);
+        internal static extern int git_remote_download(
+            RemoteSafeHandle remote,
+            git_transfer_progress_callback progress_cb,
+            IntPtr progress_payload);
 
         [DllImport(libgit2)]
         internal static extern void git_remote_set_autotag(RemoteSafeHandle remote, TagFetchMode option);
 
         [DllImport(libgit2)]
-        internal static extern void git_remote_set_callbacks(RemoteSafeHandle remote, ref GitRemoteCallbacks callbacks);
+        internal static extern void git_remote_set_callbacks(
+            RemoteSafeHandle remote,
+            ref GitRemoteCallbacks callbacks);
 
         internal delegate void remote_progress_callback(IntPtr str, int len, IntPtr data);
 
@@ -776,6 +781,8 @@ internal static extern int git_tag_delete(
         [DllImport(libgit2)]
         internal static extern void git_threads_shutdown();
 
+        internal delegate void git_transfer_progress_callback(IntPtr stats, IntPtr payload);
+
         [DllImport(libgit2)]
         internal static extern int git_tree_create_fromindex(out GitOid treeOid, IndexSafeHandle index);
 

LibGit2Sharp/ConfigurationEntry.cs

@@ -264,11 +264,11 @@ public static ObjectId git_commit_tree_oid(GitObjectSafeHandle obj)
 
         #region git_config_
 
-        public static void git_config_add_file_ondisk(ConfigurationSafeHandle config, FilePath path, int priority)
+        public static void git_config_add_file_ondisk(ConfigurationSafeHandle config, FilePath path, uint level)
         {
             using (ThreadAffinity())
             {
-                int res = NativeMethods.git_config_add_file_ondisk(config, path, priority);
+                int res = NativeMethods.git_config_add_file_ondisk(config, path, level, true);
                 Ensure.Success(res);
             }
         }
@@ -430,9 +430,9 @@ public static void git_config_set_string(ConfigurationSafeHandle config, string
 
         public static ICollection<TResult> git_config_foreach<TResult>(
             ConfigurationSafeHandle config,
-            Func<IntPtr, IntPtr, TResult> resultSelector)
+            Func<IntPtr, TResult> resultSelector)
         {
-            return git_foreach(resultSelector, c => NativeMethods.git_config_foreach(config, (x, y, p) => c(x, y, p), IntPtr.Zero));
+            return git_foreach(resultSelector, c => NativeMethods.git_config_foreach(config, (e, p) => c(e, p), IntPtr.Zero));
         }
 
         #endregion
@@ -1041,11 +1041,12 @@ public static void git_remote_disconnect(RemoteSafeHandle remote)
             }
         }
 
+        // TODO: callback & payload
         public static void git_remote_download(RemoteSafeHandle remote, ref long bytes, ref GitIndexerStats indexerStats)
         {
             using (ThreadAffinity())
             {
-                int res = NativeMethods.git_remote_download(remote, ref bytes, ref indexerStats);
+                int res = NativeMethods.git_remote_download(remote, null, IntPtr.Zero);
                 Ensure.Success(res);
             }
         }

LibGit2Sharp/ConfigurationLevel.cs

@@ -33,24 +33,33 @@ public enum FileStatus
         /// </summary>
         Removed = (1 << 2), /* GIT_STATUS_INDEX_DELETED */
 
+        /// <summary>
+        ///   The renaming of a file has been promoted from the working directory to the Index. A previous version exists in the Head.
+        /// </summary>
+        Renamed = (1 << 3), /* GIT_STATUS_INDEX_RENAMED */
+
+        TypeChangedInIndex = (1 << 4), /* GIT_STATUS_INDEX_TYPECHANGE */
+
         /// <summary>
         ///   New file in the working directory, unknown from the Index and the Head.
         /// </summary>
-        Untracked = (1 << 3), /* GIT_STATUS_WT_NEW */
+        Untracked = (1 << 7), /* GIT_STATUS_WT_NEW */
 
         /// <summary>
         ///   The file has been updated in the working directory. A previous version exists in the Index.
         /// </summary>
-        Modified = (1 << 4), /* GIT_STATUS_WT_MODIFIED */
+        Modified = (1 << 8), /* GIT_STATUS_WT_MODIFIED */
 
         /// <summary>
         ///   The file has been deleted from the working directory. A previous version exists in the Index.
         /// </summary>
-        Missing = (1 << 5), /* GIT_STATUS_WT_DELETED */
+        Missing = (1 << 9), /* GIT_STATUS_WT_DELETED */
+
+        TypeChangedInWorkdir = (1 << 10),
 
         /// <summary>
         ///   The file is <see cref="Untracked"/> but its name and/or path matches an exclude pattern in a <c>gitignore</c> file.
         /// </summary>
-        Ignored = (1 << 6), /* GIT_STATUS_IGNORED */
+        Ignored = (1 << 14), /* GIT_STATUS_IGNORED */
     }
 }

LibGit2Sharp/Core/GitConfigEntry.cs

@@ -69,6 +69,7 @@
     <Compile Include="ConfigurationEntry.cs" />
     <Compile Include="ContentChanges.cs" />
     <Compile Include="Core\GitCheckoutOpts.cs" />
+    <Compile Include="Core\GitConfigEntry.cs" />
     <Compile Include="Core\Proxy.cs" />
     <Compile Include="Handlers.cs" />
     <Compile Include="ReferenceCollectionExtensions.cs" />

LibGit2Sharp/Core/NativeMethods.cs

@@ -1 +1 @@
-03452b347ef51f3400e40fb7b33adcb4508dcbe8
+a0ce87c51c1a3b1b3b674902148ad28d8e5fa32d